summaryrefslogtreecommitdiffstats
path: root/.meteor
diff options
context:
space:
mode:
authorXavier Priour <xavier.priour@bubblyware.com>2015-11-13 12:43:34 +0100
committerXavier Priour <xavier.priour@bubblyware.com>2015-11-13 12:43:34 +0100
commita7427b9ae4e790989c49408ffe14aea4976db305 (patch)
tree3b56c753ce05ba9a5253078e2792b2c485d2912e /.meteor
parent3dc70b3ea4d49bccb10d4f2b3e317c794da91e37 (diff)
parentcb3bd86396e4d19e1f05fcb94e3527f81e70412e (diff)
downloadwekan-a7427b9ae4e790989c49408ffe14aea4976db305.tar.gz
wekan-a7427b9ae4e790989c49408ffe14aea4976db305.tar.bz2
wekan-a7427b9ae4e790989c49408ffe14aea4976db305.zip
merge with /devel
Diffstat (limited to '.meteor')
-rw-r--r--.meteor/packages4
-rw-r--r--.meteor/versions3
2 files changed, 4 insertions, 3 deletions
diff --git a/.meteor/packages b/.meteor/packages
index 39242f48..bdb0b60e 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -2,9 +2,6 @@
#
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.
-#
-# XXX Should we replace tmeasday:presence by 3stack:presence? Or maybe the
-# packages will merge in the future?
meteor-base
@@ -52,6 +49,7 @@ audit-argument-checks
kadira:blaze-layout
kadira:dochead
kadira:flow-router
+meteorhacks:fast-render
meteorhacks:picker
meteorhacks:subs-manager
mquandalle:autofocus
diff --git a/.meteor/versions b/.meteor/versions
index 44942295..e5de3720 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -35,6 +35,7 @@ cfs:tempstore@0.1.5
cfs:upload-http@0.0.20
cfs:worker@0.1.4
check@1.1.0
+chuangbo:cookie@1.1.0
coffeescript@1.0.11
cosmos:browserify@0.8.3
dburles:collection-helpers@1.0.4
@@ -75,6 +76,8 @@ meteor-base@1.0.1
meteor-platform@1.2.3
meteorhacks:aggregate@1.3.0
meteorhacks:collection-utils@1.2.0
+meteorhacks:fast-render@2.10.0
+meteorhacks:inject-data@1.4.1
meteorhacks:picker@1.0.3
meteorhacks:subs-manager@1.6.2
meteorspark:util@0.2.0