mlorb 6c80c338e4 Merge pull request #880 from mlorb/ml-sci-1316 ... Change text for avatar size on my profile page [SCI-1316]		2017-11-16 10:43:23 +01:00
..
assets	change text for avatar size on my profile page	2017-11-15 14:21:04 +01:00
controllers	Merge pull request #877 from mlorb/ml-sci-1190	2017-11-15 11:22:18 +01:00
datatables
helpers	Merge pull request #866 from biosistemika/protocols-io-import	2017-11-13 11:53:28 +01:00
mailers
models	fix preview for images with transparent background	2017-11-13 18:03:14 +01:00
services	Move duplicated code to service [SCI-1665]	2017-10-17 14:46:16 +02:00
utilities	Merge pull request #853 from Zanz2/ZZ_import_protocolsio_json	2017-11-06 14:53:01 +01:00
views	Merge pull request #878 from Zanz2/protocol_description_fix	2017-11-16 01:11:52 +01:00