scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-09 17:09:45 +08:00
Code Issues Projects Releases Packages Wiki Activity
scinote-web/app
History
Mojca Lorber 0e3526c9ad Merge branch 'mlorb-ml-sci-696' into improved-sample-table 
Conflicts:
	app/assets/javascripts/samples/sample_datatable.js
2016-12-08 15:44:50 +01:00
..
assets Merge branch 'mlorb-ml-sci-696' into improved-sample-table 2016-12-08 15:44:50 +01:00
controllers Merge branch 'mlorb-ml-sci-696' into improved-sample-table 2016-12-08 15:44:50 +01:00
datatables
helpers
mailers
models Merge branch 'mlorb-ml-sci-696' into improved-sample-table 2016-12-08 15:44:50 +01:00
utilities
views Merge branch 'mlorb-ml-sci-696' into improved-sample-table 2016-12-08 15:44:50 +01:00