scinote-web/app/assets/javascripts/samples
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
..
sample_datatable.js.erb migrate to 4.2.9 2017-06-23 08:50:12 +02:00
sample_types_groups.js remove ERROR from message 2017-04-05 14:40:55 +02:00
samples.js Samples - show all/show assigned [SCI-1277] (#644) 2017-06-06 12:46:56 +02:00
samples_importer.js Remove spinner after samples import error [SCI-1399] 2017-06-26 16:51:58 +02:00