Anton Ignatov 16d00340cd Fix merge errors		2019-05-31 10:35:04 +02:00
..
assets	Fix merge errors	2019-05-31 10:35:04 +02:00
controllers	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00
datatables	Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894]	2018-12-13 11:18:09 +01:00
helpers	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00
javascript	Fix paths for highlightjs-github-theme [SCI-3377]	2019-04-24 12:35:01 +02:00
mailers	Set version for HTTParty dependency, add opts in mailer	2019-02-19 11:23:01 +01:00
middlewares	Rename sciNote -> SciNote (app/ folder)	2018-05-21 15:19:11 +02:00
models	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00
permissions	Remove blank line	2018-10-26 11:00:13 +02:00
serializers	Force UTF-8 encoding for Table contents in API [SCI-3376]	2019-05-15 13:12:54 +02:00
services	Add aditional checks for inventory state objects [SCI-3412]	2019-05-27 17:32:21 +02:00
utilities	Fix import of ELN protocols [SCI-3506]	2019-05-29 15:41:54 +02:00
views	Merge branch 'master' into features/marvinjs-integration	2019-05-31 10:27:14 +02:00