composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

Browse Source 
# Conflicts:
#	application/datamodel.application.xml
#	application/itopwebpage.class.inc.php
#	css/light-grey.scss
This commit is contained in:
Molkobain
2020-08-19 10:20:37 +02:00
parent 417008f549 c69e83f779
commit c5b8d3fa72
80 changed files with 2483 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -146,3 +146,4 @@ local.properties
.scala_dependencies
.worksheet
/css/setup.css