summaryrefslogtreecommitdiffstats
path: root/.meteor
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-02-28 23:03:16 +0200
committerLauri Ojansivu <x@xet7.org>2019-02-28 23:03:16 +0200
commit174ad1a9877fd0b7523f9a9b074352e5268ffaf7 (patch)
tree07cce2399e7699567468987a73c1f2258a95108e /.meteor
parent199246ea6caac1cfcfe64d082ce887b3bccb1ee3 (diff)
parent49882a05d1d1e5cacc950daa282bd6f6ea0d402f (diff)
downloadwekan-174ad1a9877fd0b7523f9a9b074352e5268ffaf7.tar.gz
wekan-174ad1a9877fd0b7523f9a9b074352e5268ffaf7.tar.bz2
wekan-174ad1a9877fd0b7523f9a9b074352e5268ffaf7.zip
Merge branch 'edge' into meteor-1.8
Diffstat (limited to '.meteor')
-rw-r--r--.meteor/packages1
-rw-r--r--.meteor/versions1
2 files changed, 2 insertions, 0 deletions
diff --git a/.meteor/packages b/.meteor/packages
index bfc18103..d276463b 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -91,3 +91,4 @@ wekan:accounts-cas
wekan-scrollbar
mquandalle:perfect-scrollbar
mdg:meteor-apm-agent
+meteorhacks:unblock
diff --git a/.meteor/versions b/.meteor/versions
index 345b26c9..3f4ffcb5 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -95,6 +95,7 @@ meteorhacks:collection-utils@1.2.0
meteorhacks:meteorx@1.4.1
meteorhacks:picker@1.0.3
meteorhacks:subs-manager@1.6.4
+meteorhacks:unblock@1.1.0
meteorspark:util@0.2.0
minifier-css@1.4.1
minifier-js@2.4.0