summaryrefslogtreecommitdiffstats
path: root/.meteor/packages
diff options
context:
space:
mode:
authorXavier Priour <xavier.priour@bubblyware.com>2015-12-16 16:23:58 +0100
committerXavier Priour <xavier.priour@bubblyware.com>2015-12-16 16:23:58 +0100
commit0608b90d3b46d4e9f98518a3e8775fd8048a27ec (patch)
treea15f522c6d48340f40db7eb58a623f902558cf94 /.meteor/packages
parentf5eba16a50056c20d86044f7fa025bf21eef1264 (diff)
parent677e9937e0c1872bfe4ec5ce87bf2a8ca99febe1 (diff)
downloadwekan-0608b90d3b46d4e9f98518a3e8775fd8048a27ec.tar.gz
wekan-0608b90d3b46d4e9f98518a3e8775fd8048a27ec.tar.bz2
wekan-0608b90d3b46d4e9f98518a3e8775fd8048a27ec.zip
Merge remote-tracking branch 'upstream/devel' into devel
Diffstat (limited to '.meteor/packages')
-rw-r--r--.meteor/packages2
1 files changed, 1 insertions, 1 deletions
diff --git a/.meteor/packages b/.meteor/packages
index 7de4e063..c9d81082 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -18,13 +18,13 @@ es5-shim
aldeed:collection2
cfs:gridfs
cfs:standard-packages
+cottz:publish-relations
dburles:collection-helpers
idmontie:migrations
matb33:collection-hooks
matteodem:easy-search
mongo
mquandalle:collection-mutations
-reywood:publish-composite
# Account system
accounts-password