scinote-web/db
Luka Murn 9f60ece25f Merge branch 'master' into rails-5.1
Conflicts:
	app/models/repository.rb
	app/models/repository_row.rb
	app/views/projects/index.html.erb
	app/views/shared/_secondary_navigation.html.erb
2017-07-06 15:12:15 +02:00
..
migrate Merge branch 'master' into rails-5.1 2017-07-06 15:12:15 +02:00
load_users_template.yml rename organizations in test/ 2017-01-25 13:56:43 +01:00
schema.rb Change some stuff for repos to work, fix some bugs 2017-06-07 18:07:49 +02:00
seeds.rb fixes hound 2017-01-31 13:33:55 +01:00