mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-26 10:26:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests

Browse source
This commit is contained in:
John McLear 2014-11-26 15:33:13 +00:00
commit 88b3d99fbd
7 changed files with 36 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/installDeps.sh
View file

@ -99,7 +99,7 @@ fi
echo "Clear minfified cache..."
rm -f var/minified*
echo "ensure custom css/js files are created..."
echo "Ensure custom css/js files are created..."
for f in "index" "pad" "timeslider"
do

2
bin/run.sh
View file

@ -32,7 +32,7 @@ fi
bin/installDeps.sh $* || exit 1
#Move to the node folder and start
echo "start..."
echo "Started Etherpad..."
SCRIPTPATH=`pwd -P`
node $SCRIPTPATH/node_modules/ep_etherpad-lite/node/server.js $*