FIX #20786 TIME 0 fix conflicts : Merge branch '21.03' into 'fix/20786/21.03'
# Conflicts: # migration/21.03/210321.sql # src/core/controllers/AutoCompleteController.php
No related branches found
No related tags found
Showing
- dist/index.html 1 addition, 1 deletiondist/index.html
- dist/main-es2015.507008b47f278def5a30.js 1 addition, 1 deletiondist/main-es2015.507008b47f278def5a30.js
- dist/main-es5.507008b47f278def5a30.js 1 addition, 1 deletiondist/main-es5.507008b47f278def5a30.js
- dist/tinymce/plugins/emoticons/js/emojiimages.js 0 additions, 9424 deletionsdist/tinymce/plugins/emoticons/js/emojiimages.js
- dist/tinymce/plugins/emoticons/js/emojiimages.min.js 0 additions, 3 deletionsdist/tinymce/plugins/emoticons/js/emojiimages.min.js
- dist/tinymce/skins/ui/oxide-dark/skin.shadowdom.css 0 additions, 37 deletionsdist/tinymce/skins/ui/oxide-dark/skin.shadowdom.css
- dist/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css 0 additions, 7 deletionsdist/tinymce/skins/ui/oxide-dark/skin.shadowdom.min.css
- dist/tinymce/skins/ui/oxide/skin.shadowdom.css 0 additions, 37 deletionsdist/tinymce/skins/ui/oxide/skin.shadowdom.css
- dist/tinymce/skins/ui/oxide/skin.shadowdom.min.css 0 additions, 7 deletionsdist/tinymce/skins/ui/oxide/skin.shadowdom.min.css
- migration/21.03/210320.sql 12 additions, 0 deletionsmigration/21.03/210320.sql
- migration/21.03/210321.sql 60 additions, 2 deletionsmigration/21.03/210321.sql
- package.json 1 addition, 1 deletionpackage.json
- rest/index.php 1 addition, 0 deletionsrest/index.php
- sql/data_en.sql 1 addition, 1 deletionsql/data_en.sql
- sql/data_fr.sql 1 addition, 1 deletionsql/data_fr.sql
- sql/structure.sql 31 additions, 0 deletionssql/structure.sql
- src/app/contact/controllers/ContactController.php 2 additions, 2 deletionssrc/app/contact/controllers/ContactController.php
- src/app/contentManagement/controllers/MergeController.php 2 additions, 0 deletionssrc/app/contentManagement/controllers/MergeController.php
- src/app/entity/controllers/EntityController.php 30 additions, 1 deletionsrc/app/entity/controllers/EntityController.php
- src/app/external/externalSignatoryBook/controllers/IxbusController.php 40 additions, 46 deletions...nal/externalSignatoryBook/controllers/IxbusController.php
Loading
Please register or sign in to comment