Merge branch 'jtickle-devel' into devel

Fix double slash issue. Thanks to jtickle ! Closes #1110

CHANGELOG.md

@@ -11,9 +11,10 @@ This release adds the following new features:
 
 and fixes the following bugs:
 
-* [Possible to add empty item to checklist](https://github.com/wekan/wekan/pull/1107).
+* [Possible to add empty item to checklist](https://github.com/wekan/wekan/pull/1107);
+* [Double-slash issue](https://github.com/wekan/wekan/pull/1114).
 
-Thanks to GitHub users GhassenRjab, nztqa and zarnifoulette for their contributions.
+Thanks to GitHub users GhassenRjab, jtickle, nztqa and zarnifoulette for their contributions.
 
 # v0.27 2017-06-28 Wekan release
 

Dockerfile

@@ -96,12 +96,13 @@ RUN \
       gosu wekan:wekan sh ./install_meteor.sh; \
     else \
       gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} git://github.com/meteor/meteor.git /home/wekan/.meteor && \
-      cd /home/wekan/packages && \
-      gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \
-      gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
-      cd /home/wekan/.meteor && \
-      gosu wekan /home/wekan/.meteor/meteor -- help; \
     fi && \
+    cd /home/wekan/.meteor/packages && \
+    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \
+    gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
+    sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/.meteor/packages/meteor-useraccounts-core/package.js && \
+    cd /home/wekan/.meteor && \
+    gosu wekan /home/wekan/.meteor/meteor -- help; \
     \
     # Build app
     cd /home/wekan/app && \