scinote-web/config
Matej Zrimšek e3a7f45fdf Merge branch 'master' into mz_file_upload_and_client_side_upgrade
Conflicts:
	app/assets/javascripts/application.js
	app/views/results/_result_asset.html.erb
	app/views/steps/_step.html.erb
2016-08-26 11:13:40 +02:00
..
environments Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
initializers Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
locales Merge branch 'master' into mz_file_upload_and_client_side_upgrade 2016-08-26 11:13:40 +02:00
application.rb Initial commit. 2016-02-12 16:52:43 +01:00
boot.rb Initial commit. 2016-02-12 16:52:43 +01:00
database.yml Initial commit. 2016-02-12 16:52:43 +01:00
environment.rb Initial commit. 2016-02-12 16:52:43 +01:00
puma.rb Initial commit. 2016-02-12 16:52:43 +01:00
routes.rb Update permission_helper.rb and routes.rb 2016-08-25 13:51:30 +02:00
secrets.yml Initial commit. 2016-02-12 16:52:43 +01:00
skylight.yml Initial commit. 2016-02-12 16:52:43 +01:00