scinote-web/app
Jure Grabnar 00da7efb44 Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows'
Conflicts:
	app/models/experiment.rb

SCI-328 #close
2016-08-24 13:11:10 +02:00
..
assets Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows' 2016-08-24 13:11:10 +02:00
controllers Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows' 2016-08-24 13:11:10 +02:00
datatables Merge pull request #58 from ZmagoD/zd_SCI_74 2016-08-17 10:00:47 +02:00
helpers Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows' 2016-08-24 13:11:10 +02:00
mailers Migration GitLab -> GitHub 2016-07-21 13:11:15 +02:00
models Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows' 2016-08-24 13:11:10 +02:00
utilities Fix activity in first time generator 2016-08-18 08:33:08 +02:00
views Merge remote-tracking branch 'origin/jg_SCI_328_moving_workflows' 2016-08-24 13:11:10 +02:00