diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-12-09 00:51:50 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-12-09 00:51:50 +0200 |
| commit | 25fac166cf58cfd35c45eda4375dc25e92629670 (patch) | |
| tree | 9c1975377b42a39ce96c42e1b760b2004bf03366 /.meteor | |
| parent | 66d1546081743ca0268a38436a801aa92d56093f (diff) | |
| parent | b143fc9297f7c60b4bd27350d9216ccdae31c67b (diff) | |
| download | wekan-25fac166cf58cfd35c45eda4375dc25e92629670.tar.gz wekan-25fac166cf58cfd35c45eda4375dc25e92629670.tar.bz2 wekan-25fac166cf58cfd35c45eda4375dc25e92629670.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to '.meteor')
| -rw-r--r-- | .meteor/packages | 2 | ||||
| -rw-r--r-- | .meteor/versions | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.meteor/packages b/.meteor/packages index 71fb9ad0..39cf2510 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -64,7 +64,6 @@ mousetrap:mousetrap mquandalle:jquery-textcomplete mquandalle:jquery-ui-drag-drop-sort mquandalle:mousetrap-bindglobal -mquandalle:perfect-scrollbar peerlibrary:blaze-components@=0.15.1 perak:markdown templates:tabs @@ -90,3 +89,4 @@ mquandalle:moment msavin:usercache wekan:wekan-ldap wekan:accounts-cas +maazalik:malihu-jquery-custom-scrollbar diff --git a/.meteor/versions b/.meteor/versions index d35d4a34..139bc85f 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -84,6 +84,7 @@ launch-screen@1.1.1 livedata@1.0.18 localstorage@1.2.0 logging@1.1.20 +maazalik:malihu-jquery-custom-scrollbar@3.0.6 matb33:collection-hooks@0.8.4 matteodem:easy-search@1.6.4 mdg:validation-error@0.5.1 @@ -120,7 +121,6 @@ mquandalle:jquery-textcomplete@0.8.0_1 mquandalle:jquery-ui-drag-drop-sort@0.2.0 mquandalle:moment@1.0.1 mquandalle:mousetrap-bindglobal@0.0.1 -mquandalle:perfect-scrollbar@0.6.5_2 msavin:usercache@1.0.0 npm-bcrypt@0.9.3 npm-mongo@3.1.2-beta181.8 |