scinote-web/app/views/projects
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
..
archive
experiment_archive
index
show
_edit.html.erb
_new.html.erb
_notifications.html.erb
archive.html.erb
experiment_archive.html.erb
index.html.erb Merge branch 'master' into rails-5.1 2017-07-06 15:12:15 +02:00
samples.html.erb
show.html.erb