jalik:ufs upgraded from 0.3.4 to 0.3.5

momentjs:moment upgraded from 2.10.6 to 2.11.0

.meteor/packages

@@ -52,6 +52,7 @@ rocketchat:github-enterprise
 rocketchat:gitlab
 rocketchat:highlight
 rocketchat:ldap
+rocketchat:livechat
 rocketchat:logger
 rocketchat:mailer
 rocketchat:markdown
@@ -63,8 +64,8 @@ rocketchat:message-star
 rocketchat:oembed
 rocketchat:slashcommands-invite
 rocketchat:slashcommands-join
-rocketchat:slashcommands-leave
 rocketchat:slashcommands-kick
+rocketchat:slashcommands-leave
 rocketchat:slashcommands-mute
 rocketchat:spotify
 rocketchat:statistics
@@ -84,7 +85,6 @@ rocketchat:wordpress
 #rocketchat:chatops
 #rocketchat:hubot
 #rocketchat:irc
-rocketchat:livechat
 
 konecty:change-case
 konecty:delayed-task

.meteor/versions

@@ -52,7 +52,7 @@ htmljs@1.0.5
 http@1.1.1
 id-map@1.0.4
 idorecall:email-normalize@1.0.0
-jalik:ufs@0.3.4
+jalik:ufs@0.3.5
 jalik:ufs-gridfs@0.1.1
 jparker:crypto-core@0.1.0
 jparker:crypto-md5@0.1.1
@@ -86,7 +86,7 @@ mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
 mobile-experience@1.0.1
 mobile-status-bar@1.0.6
-momentjs:moment@2.10.6
+momentjs:moment@2.11.0
 monbro:mongodb-mapreduce-aggregation@1.0.1
 mongo@1.1.3
 mongo-id@1.0.1

.travis.yml

@@ -2,8 +2,9 @@ sudo: required
 language: node_js
 branches:
   only:
-  - develop
   - master
+  - develop
+  - beta
   - "/^v(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)$/"
 git:
   depth: 1

Dockerfile

@@ -2,10 +2,6 @@ FROM node:0.10
 
 MAINTAINER buildmaster@rocket.chat
 
-RUN apt-get update \
-&&  apt-get install -y graphicsmagick \
-&&  rm -rf /var/lib/apt/lists/*
-
 RUN groupadd -r rocketchat \
 &&  useradd -r -g rocketchat rocketchat \
 &&  mkdir /app  \

example-build.sh

 #!/bin/bash
 export METEOR_SETTINGS=$(cat settings.json)
-meteor add rocketchat:livechat rocketchat:hubot meteorhacks:kadira
+meteor add rocketchat:hubot meteorhacks:kadira
 meteor build --server https://demo.rocket.chat --directory /var/www/rocket.chat
 cd /var/www/rocket.chat/bundle/programs/server
 npm install