Anton Ignatov 88e67a16c2 Merge branch 'master-with-note-section' into feature/marvinjs-integration		2019-05-02 16:16:03 +02:00
..
assets	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +02:00
controllers	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +02:00
datatables
helpers	Fix markup	2019-04-28 19:11:41 +02:00
javascript	Fix paths for highlightjs-github-theme [SCI-3377]	2019-04-24 12:35:01 +02:00
mailers
middlewares
models	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +02:00
permissions
serializers	Update API endpoints for new activities	2019-04-08 15:07:45 +02:00
services	Fix sorting by user name with search parameter in inventories [SCI-3391]	2019-04-25 16:29:41 +02:00
utilities	Merge branch 'master' into master-with-note-section	2019-04-30 12:07:59 +02:00
views	Merge branch 'master-with-note-section' into feature/marvinjs-integration	2019-05-02 16:16:03 +02:00