Julia Radzhabova 72444bd988 Merge branch 'develop' into feature/print-area		2018-09-04 12:07:12 +03:00
..
collection	[DE] refactoring	2018-03-28 13:37:41 +03:00
controller	[DE] Fix 38604	2018-08-28 17:52:21 +03:00
model	Update copyright to 2018	2018-03-01 15:16:38 +03:00
template	[DE] Add rotation to image and shape settings in the right panel	2018-08-10 09:16:15 +03:00
view	Merge branch 'develop' into feature/print-area	2018-09-04 12:07:12 +03:00