diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-04-18 13:34:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-18 13:34:40 +0300 |
| commit | 0f3579fd7bd53fe0f94132f30dc010940d93b26c (patch) | |
| tree | 753ae9120fde3acec99d42f8c54346f945b53966 /.meteor | |
| parent | dc11e0c79cf7dad5f9988cf77cabf08b8878c9b6 (diff) | |
| parent | db7b7158faf265b8c1427724082c959bec681e35 (diff) | |
| download | wekan-0f3579fd7bd53fe0f94132f30dc010940d93b26c.tar.gz wekan-0f3579fd7bd53fe0f94132f30dc010940d93b26c.tar.bz2 wekan-0f3579fd7bd53fe0f94132f30dc010940d93b26c.zip | |
Merge branch 'devel' into improve-mobile-ui
Diffstat (limited to '.meteor')
| -rw-r--r-- | .meteor/packages | 2 | ||||
| -rw-r--r-- | .meteor/versions | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/.meteor/packages b/.meteor/packages index 9a3f9bca..81f1ee05 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -66,7 +66,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 @@ -92,3 +91,4 @@ mquandalle:perfect-scrollbar mdg:meteor-apm-agent meteorhacks:unblock lucasantoniassi:accounts-lockout +wekan-markdown diff --git a/.meteor/versions b/.meteor/versions index 72c1fd55..8d28d511 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,5 +1,6 @@ 3stack:presence@1.1.2 accounts-base@1.4.0 +accounts-oauth@1.1.15 accounts-password@1.5.0 aldeed:collection2@2.10.0 aldeed:collection2-core@1.2.0 @@ -121,7 +122,8 @@ mquandalle:perfect-scrollbar@0.6.5_2 msavin:usercache@1.0.0 npm-bcrypt@0.9.3 npm-mongo@2.2.33 -observe-sequence@1.0.16 +oauth@1.2.1 +oauth2@1.2.0 ongoworks:speakingurl@1.1.0 ordered-dict@1.0.9 peerlibrary:assert@0.2.5 @@ -129,7 +131,6 @@ peerlibrary:base-component@0.16.0 peerlibrary:blaze-components@0.15.1 peerlibrary:computed-field@0.7.0 peerlibrary:reactive-field@0.3.0 -perak:markdown@1.0.5 promise@0.10.0 raix:eventemitter@0.1.3 raix:handlebar-helpers@0.2.5 @@ -176,4 +177,11 @@ useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 webapp@1.4.0 webapp-hashing@1.0.9 -zimme:active-route@2.3.2 +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 +yasaricli:slugify@0.0.7 +zimme:active-route@2.3.2
\ No newline at end of file |