Clement Ho 6384aedace Merge branch 'master' into 'bootstrap4' ... # Conflicts: # app/views/admin/application_settings/_signin.html.haml		2018-04-16 15:05:01 +00:00
..
project	Replace the `project/commits/comments.feature` spinach test with an rspec analog	2018-04-16 08:53:27 +00:00
steps	Merge branch 'master' into 'bootstrap4'	2018-04-16 15:05:01 +00:00
support	remove --disable-gpu flag as it is no longer needed	2018-04-13 01:30:08 -05:00