Sebastian Grewe 82efbb4609 Merge branch 'issue-1185' into next ... Conflicts: public/templates/mpos/global/navigation.tpl		2013-12-31 17:11:03 +01:00
..
include	Merge branch 'issue-1185' into next	2013-12-31 17:11:03 +01:00
site_assets	Merge branch 'issue-1185' into next	2013-12-31 17:11:03 +01:00
templates	Merge branch 'issue-1185' into next	2013-12-31 17:11:03 +01:00
.htaccess	[IMPROVED] Adding customizable error page to MPOS	2013-10-19 09:16:57 +02:00
favicon.ico	initial import of file base of my WIP	2013-05-06 14:11:38 +02:00
index.php	Merge branch 'issue-965' into next	2013-12-31 16:27:16 +01:00