scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 23:15:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app
History
Luka Murn 82f982e983 Merge branch 'rails-5.1' into decoupling-settings-page 
Conflicts:
	Gemfile
	Gemfile.lock
2017-10-23 10:59:10 +02:00
..
assets Merge branch 'master' into rails-5.1 2017-10-23 08:57:57 +02:00
controllers Merge branch 'rails-5.1' into decoupling-settings-page 2017-10-23 10:59:10 +02:00
datatables
helpers Merge branch 'rails-5.1' into decoupling-settings-page 2017-10-23 10:59:10 +02:00
javascript Merge pull request #821 from ZmagoD/zd_SCI_1572 2017-10-20 20:17:37 +02:00
mailers
models Merge branch 'rails-5.1' into decoupling-settings-page 2017-10-23 10:59:10 +02:00
serializers
services Merge branch 'rails-5.1' into decoupling-settings-page 2017-10-23 10:59:10 +02:00
utilities
views Merge branch 'rails-5.1' into decoupling-settings-page 2017-10-23 10:59:10 +02:00