diff options
| author | Xavier Priour <xavier.priour@bubblyware.com> | 2015-10-23 03:38:38 +0200 |
|---|---|---|
| committer | Xavier Priour <xavier.priour@bubblyware.com> | 2015-10-23 03:38:38 +0200 |
| commit | 658ef5ebe112edd55eb8cf160e02a46eb2e13afd (patch) | |
| tree | 91991e142582b1ae71f5369a8ef9c202908ba8c2 /.meteor | |
| parent | 027aacb50e2baf715c89d914e34132458cf11691 (diff) | |
| parent | b3696e1e3b366770af8c41861b5cf996cdd2378a (diff) | |
| download | wekan-658ef5ebe112edd55eb8cf160e02a46eb2e13afd.tar.gz wekan-658ef5ebe112edd55eb8cf160e02a46eb2e13afd.tar.bz2 wekan-658ef5ebe112edd55eb8cf160e02a46eb2e13afd.zip | |
Merge branch 'devel' into feature/import-board-members
Diffstat (limited to '.meteor')
| -rw-r--r-- | .meteor/packages | 1 | ||||
| -rw-r--r-- | .meteor/versions | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/.meteor/packages b/.meteor/packages index 765932d4..39242f48 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -50,6 +50,7 @@ alethes:pages arillo:flow-router-helpers audit-argument-checks kadira:blaze-layout +kadira:dochead kadira:flow-router meteorhacks:picker meteorhacks:subs-manager diff --git a/.meteor/versions b/.meteor/versions index 9a2087f1..840f09f9 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -60,7 +60,9 @@ http@1.1.1 id-map@1.0.4 idmontie:migrations@1.0.0 jquery@1.11.4 +jsx@0.1.6 kadira:blaze-layout@2.2.0 +kadira:dochead@1.1.0 kadira:flow-router@2.7.0 kenton:accounts-sandstorm@0.1.6 launch-screen@1.0.4 |