The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Wolfgang Ginolas 2023-06-22 15:08:35 +02:00
parent b9208eecd4
commit cd9fba9002
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/application_config_internal.js
View File

@ -193,12 +193,7 @@ define(function() {
poll: 'cptools-poll',
form: 'cptools-poll',
whiteboard: 'cptools-whiteboard',
<<<<<<< HEAD
diagram: 'cptools-diagram',
||||||| c94666efb
=======
drawio: 'cptools-diagram',
>>>>>>> origin/drawio-bower
todo: 'cptools-todo',
contacts: 'fa-address-book',
calendar: 'fa-calendar',