scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-09 17:09:45 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/config
History
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
boot.rb
database.yml
environment.rb
puma.rb
routes.rb Update permission_helper.rb and routes.rb 2016-08-25 13:51:30 +02:00
secrets.yml
skylight.yml