Merge branch 'master' into redux-polling

2016-12-27 18:22:06 +01:00
parent 3ad648dd63 48fa7ab919
commit 5ec12e4b5b
235 changed files with 3445 additions and 1099 deletions
--- a/spec/features/admin/feature_flags_spec.rb
+++ b/spec/features/admin/feature_flags_spec.rb
@@ -62,4 +62,5 @@ feature 'Admin feature flags' do
      expect(page).to have_link "Spending proposals"
    end
  end
+
 end