Merge branch 'develop' into feature/messages_api

Conflicts:
	users/config/locales/en.yml

1 files changed, 0 insertions, 1 deletions

diff --git a/Gemfile b/Gemfile
index a608764..1d6c432 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,6 @@ group :test do
   gem 'capybara', require: false
   gem 'launchy' # so save_and_open_page works in integration tests
   gem 'phantomjs-binaries'
-  gem 'minitest'
   gem 'minitest-stub-const'
 end