scinote-web/db
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
..
migrate Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
load_users_template.yml Initial commit. 2016-02-12 16:52:43 +01:00
schema.rb Merge branch 'improved-files-handling' into 'master' 2017-01-18 11:29:40 +01:00
seeds.rb fixed user_generator 2016-10-17 15:10:26 +02:00