Merge branch 'develop' into subscription-audio-notification

# Conflicts: # server/startup/migrations/v077.js
vickychu · Dec 29, 2016 · 8c04163 · 8c04163
2 parents 28a96ab + 7b132cd
commit 8c04163
Show file tree

Hide file tree

Showing 120 changed files with 2,259 additions and 2,676 deletions.
diff --git a/.stylelintignore b/.stylelintignore
@@ -1,2 +1,2 @@
-packages/rocketchat-livechat/app/client/stylesheets/utils/_reset.import.less
-packages/rocketchat-theme/assets/stylesheets/utils/_lesshat.import.less
+**/lesshat.less
+**/_lesshat.import.less
diff --git a/FEATURES.md b/FEATURES.md
@@ -1,3 +1,5 @@
+# Features
+
 - Self Host
   - Docker  
   - Multiple Deployment Options (Heroku, Digital Ocean, Sandstorm, etc.)