diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-04-20 16:51:57 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-04-20 16:51:57 +0300 |
| commit | 02819ca16969b103493ebdd9a66f058995421507 (patch) | |
| tree | a3352b65083c79ab733db2b99e7c4f0a1276277e /.meteor | |
| parent | 53d42a17ffbc6466d2d422dfdcbd867ea31fe082 (diff) | |
| parent | a5122cc0764b57a163c3e8ca3e00e703669a98db (diff) | |
| download | wekan-02819ca16969b103493ebdd9a66f058995421507.tar.gz wekan-02819ca16969b103493ebdd9a66f058995421507.tar.bz2 wekan-02819ca16969b103493ebdd9a66f058995421507.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to '.meteor')
| -rw-r--r-- | .meteor/packages | 6 | ||||
| -rw-r--r-- | .meteor/versions | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.meteor/packages b/.meteor/packages index b4593f1b..a4c9a081 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -30,8 +30,8 @@ kenton:accounts-sandstorm service-configuration@1.0.11 useraccounts:unstyled useraccounts:flow-routing -wekan:wekan-ldap -wekan:accounts-cas +wekan-ldap +wekan-accounts-cas wekan-accounts-oidc # Utilities @@ -63,7 +63,6 @@ mquandalle:jquery-textcomplete mquandalle:jquery-ui-drag-drop-sort mquandalle:mousetrap-bindglobal peerlibrary:blaze-components@=0.15.1 -perak:markdown templates:tabs verron:autosize simple:json-routes @@ -93,3 +92,4 @@ meteorhacks:subs-manager meteorhacks:picker lamhieu:unblock meteorhacks:aggregate@1.3.0 +wekan-markdown diff --git a/.meteor/versions b/.meteor/versions index 3a2eb046..efc47d9e 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -137,7 +137,6 @@ peerlibrary:base-component@0.16.0 peerlibrary:blaze-components@0.15.1 peerlibrary:computed-field@0.9.0 peerlibrary:reactive-field@0.5.0 -perak:markdown@1.0.5 promise@0.11.2 raix:eventemitter@0.1.3 raix:handlebar-helpers@0.2.5 @@ -185,9 +184,10 @@ verron:autosize@3.0.8 webapp@1.7.4 webapp-hashing@1.0.9 wekan-accounts-oidc@1.0.10 +wekan-markdown@1.0.7 wekan-oidc@1.0.12 wekan-scrollbar@3.1.3 -wekan:accounts-cas@0.1.0 -wekan:wekan-ldap@0.0.2 +wekan-accounts-cas@0.1.0 +wekan-ldap@0.0.2 yasaricli:slugify@0.0.7 zimme:active-route@2.3.2 |