scinote-web/config
Luka Murn cf72da5635 Merge branch 'improved-files-handling' into 'master'
Conflicts:
	app/assets/javascripts/protocols/steps.js.erb
	app/helpers/assets_helper.rb
	db/schema.rb
2017-01-18 11:29:40 +01:00
..
environments add switch to toggle email confirmations 2016-11-23 09:49:52 +01:00
initializers Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
locales Improve error message whan importing CSV files with incorrect character encoding [SCI-815] 2017-01-05 17:00:21 +01:00
application.rb
boot.rb
database.yml
environment.rb
puma.rb
routes.rb Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
secrets.yml
skylight.yml