5 Commits

Author	SHA1	Message	Date
iAmShorty	7358b420f1	[UPDATE] switch instead of if	2014-05-05 14:35:05 +02:00
iAmShorty	2c24099e93	[UPDATE] alert styles	2014-05-05 14:27:38 +02:00
Sebastian Grewe	fcaffe7fc0	[MERGE] Fix conflicts with development	2014-05-03 12:18:30 +02:00
Sebastian Grewe	43bf7be200	[FIX] Merge conflict with development	2014-04-24 11:43:38 +02:00
Sebastian Grewe	1456bd21ef	[MOVED] Removed include and templates from public [TESTING]	2014-04-20 15:34:55 +02:00