Nathaniel Guse 73b950d2f1 Merge remote-tracking branch 'remotes/Crizz0/ticket/12404' into develop-ascraeus ... # By Crizzo # Via Crizzo * remotes/Crizz0/ticket/12404: [ticket/12404] Splits up the line 18 in subsilver2 into more lines [ticket/12404] Changes append/prepend to after/before [ticket/12404] Adds two new events and changes some places [ticket/12404] Adds a new event before and after the Timezone display		2014-05-01 22:24:31 -05:00
..
template	Merge remote-tracking branch 'remotes/Crizz0/ticket/12404' into develop-ascraeus	2014-05-01 22:24:31 -05:00
theme	Merge remote-tracking branch 'PayBas/ticket/12389' into develop-ascraeus	2014-04-25 07:33:22 -07:00
style.cfg	[prep-release-3.1.0-b2] Update version to 3.1.0-b2	2014-03-30 22:08:10 +02:00