Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
web-apps/apps/common/main/resources/img/toolbar
History
Maxim Kadushkin 5b57ee760b Merge branch 'develop' into feature/colors-table 
# Conflicts:
#	apps/common/main/resources/less/loadmask.less
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/FileMenuPanels.js
#	apps/documenteditor/main/resources/less/toolbar.less
#	apps/presentationeditor/main/app/controller/Main.js
#	apps/presentationeditor/main/app/controller/RightMenu.js
#	apps/presentationeditor/main/app/view/FileMenuPanels.js
#	apps/presentationeditor/main/app/view/SlideSettings.js
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
#	apps/spreadsheeteditor/main/resources/less/toolbar.less
2021-02-06 14:42:56 +03:00
..
1.5x Update icons 2021-02-05 16:41:12 +03:00
1.25x Update icons 2021-02-05 16:41:12 +03:00
1.75x Update icons 2021-02-05 16:41:12 +03:00
1x Merge branch 'develop' into feature/colors-table 2021-02-06 14:42:56 +03:00
2x Merge branch 'develop' into feature/colors-table 2021-02-06 14:42:56 +03:00
bullets-and-numbering.png Move common icons. 2018-02-20 15:29:01 +03:00
bullets-and-numbering@2x.png Move common icons. 2018-02-20 15:29:01 +03:00
charttypes.svg Merge branch 'develop' into feature/colors-table 2021-02-06 14:42:56 +03:00
math.png Move common icons. 2018-02-20 15:29:01 +03:00
math@2x.png Move common icons. 2018-02-20 15:29:01 +03:00
shapetypes.svg Use svg icons for autoshapes 2019-04-01 16:10:35 +03:00