This repository has been archived by the owner on Sep 26, 2024. It is now read-only.
1.2.0-Mido
Pre-release
Pre-release
Merge branch 'master' into dev/1.2.0 # Conflicts: # karma.conf.js # pom.xml # src/main/java/com/zfgc/ForumApplication.java # src/main/java/com/zfgc/dataprovider/SystemSettingsDataProvider.java # src/main/java/com/zfgc/dataprovider/UserProfileDataProvider.java # src/main/java/com/zfgc/model/BaseZfgcModel.java # src/main/java/com/zfgc/services/system/SystemService.java # src/main/java/com/zfgc/util/time/ZfgcTimeUtils.java # src/main/resources/generatorConfig.xml # src/main/webapp/assets/styles/global.scss # src/main/webapp/assets/styles/themes/midnight.scss # src/main/webapp/assets/styles/users.scss # src/main/webapp/index.html