BrokenFire 5e5419d2be Revert "Merge branch 'devel' into origin/master" ... This reverts commit 34ce297e7c1ff524cb39ee97e415cd53f624a94d.		2018-02-15 00:57:32 +01:00
..
static	Revert "Merge branch 'devel' into origin/master"	2018-02-15 00:57:32 +01:00
templates	Revert "Merge branch 'devel' into origin/master"	2018-02-15 00:57:32 +01:00
application.properties	Revert "Merge branch 'devel' into origin/master"	2018-02-15 00:57:32 +01:00
log4j2.xml	Revert "Merge branch 'devel' into origin/master"	2018-02-15 00:57:32 +01:00