diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-12-14 23:34:06 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-12-14 23:34:06 +0200 |
commit | 34f2e4466ed36afa9974d860acc7fffed0612e91 (patch) | |
tree | 813f07393289adca2dba2ec56eba62705cac0720 /.meteor | |
parent | 73f288cd9b4b35e13d8e8e6462d1b44fa1096bc6 (diff) | |
parent | c066883dbd76110be19d75bd77ef2a0270dadda2 (diff) | |
download | wekan-34f2e4466ed36afa9974d860acc7fffed0612e91.tar.gz wekan-34f2e4466ed36afa9974d860acc7fffed0612e91.tar.bz2 wekan-34f2e4466ed36afa9974d860acc7fffed0612e91.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 39cf2510..08afd4f2 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -89,4 +89,4 @@ mquandalle:moment msavin:usercache wekan:wekan-ldap wekan:accounts-cas -maazalik:malihu-jquery-custom-scrollbar +wekan-scrollbar diff --git a/.meteor/versions b/.meteor/versions index 139bc85f..872c8d3b 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -84,7 +84,6 @@ 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 @@ -184,6 +183,7 @@ useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 webapp@1.7.2 webapp-hashing@1.0.9 +wekan-scrollbar@3.1.3 wekan:accounts-cas@0.1.0 wekan:wekan-ldap@0.0.2 yasaricli:slugify@0.0.7 |