diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-11-17 14:51:22 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-11-17 14:51:22 +0200 |
| commit | b8b1512e266a24d7e7e13cd70dd116b5ba35afee (patch) | |
| tree | 6eceac9c10576d9324beba89cf8d19bf48d4511a /.meteor | |
| parent | 3300c69a039b3a4aa54c21340104a231cf2e80b1 (diff) | |
| parent | 960b33c3d91f2d3c943b8d889292ac4e7407ddcd (diff) | |
| download | wekan-b8b1512e266a24d7e7e13cd70dd116b5ba35afee.tar.gz wekan-b8b1512e266a24d7e7e13cd70dd116b5ba35afee.tar.bz2 wekan-b8b1512e266a24d7e7e13cd70dd116b5ba35afee.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to '.meteor')
| -rw-r--r-- | .meteor/packages | 1 | ||||
| -rw-r--r-- | .meteor/versions | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.meteor/packages b/.meteor/packages index 65d54fd2..b4c3765b 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -90,3 +90,4 @@ mquandalle:moment msavin:usercache wekan:wekan-ldap wekan:accounts-cas +msavin:sjobs diff --git a/.meteor/versions b/.meteor/versions index 8d10ad73..4513dd50 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -121,6 +121,7 @@ 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:sjobs@3.0.6 msavin:usercache@1.0.0 npm-bcrypt@0.9.3 npm-mongo@3.1.1 |