diff options
author | Xavier Priour <xavier.priour@bubblyware.com> | 2015-12-16 16:23:58 +0100 |
---|---|---|
committer | Xavier Priour <xavier.priour@bubblyware.com> | 2015-12-16 16:23:58 +0100 |
commit | 0608b90d3b46d4e9f98518a3e8775fd8048a27ec (patch) | |
tree | a15f522c6d48340f40db7eb58a623f902558cf94 /.meteor | |
parent | f5eba16a50056c20d86044f7fa025bf21eef1264 (diff) | |
parent | 677e9937e0c1872bfe4ec5ce87bf2a8ca99febe1 (diff) | |
download | wekan-0608b90d3b46d4e9f98518a3e8775fd8048a27ec.tar.gz wekan-0608b90d3b46d4e9f98518a3e8775fd8048a27ec.tar.bz2 wekan-0608b90d3b46d4e9f98518a3e8775fd8048a27ec.zip |
Merge remote-tracking branch 'upstream/devel' into devel
Diffstat (limited to '.meteor')
-rw-r--r-- | .meteor/packages | 2 | ||||
-rw-r--r-- | .meteor/versions | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/.meteor/versions b/.meteor/versions index 36029fcf..6c0486b6 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -39,6 +39,7 @@ check@1.1.0 chuangbo:cookie@1.1.0 coffeescript@1.0.11 cosmos:browserify@0.9.2 +cottz:publish-relations@2.0.0 dburles:collection-helpers@1.0.4 ddp@1.2.2 ddp-client@1.2.1 @@ -120,7 +121,6 @@ reactive-dict@1.1.3 reactive-var@1.0.6 reload@1.1.4 retry@1.0.4 -reywood:publish-composite@1.4.2 routepolicy@1.0.6 seriousm:emoji-continued@1.4.0 service-configuration@1.0.5 |