Merge branch 'develop' of github.com:monotek/zammad into develop

This commit is contained in:
André Bauer 2016-10-21 15:34:45 +02:00
commit a4bc26cc48

View file

@ -38,9 +38,9 @@
* rake assets:precompile * rake assets:precompile
### Start Zammad ### Start Zammad
* rails s -p 3000 * rails s -p 3000 &>> log/zammad.log &
* script/websocket-server.rb start * script/websocket-server.rb start &>> log/zammad.log &
* script/scheduler.rb start * script/scheduler.rb start &>> log/zammad.log &
### Restart nginx as root ### Restart nginx as root
* exit * exit