Sebastian Grewe 37f50256ab Merge branch 'development' of https://github.com/MPOS/php-mpos into development		2014-04-04 10:34:55 +02:00
..
include	Merge branch 'development' of https://github.com/MPOS/php-mpos into development	2014-04-04 10:34:55 +02:00
site_assets	[FIX] Merge conflict	2014-04-04 10:34:04 +02:00
templates	[FIX] Merge conflict	2014-04-04 10:34:04 +02:00
.htaccess	Various Fixes	2014-03-01 17:57:43 -07:00
favicon.ico	Various Fixes	2014-03-01 17:57:43 -07:00
index.php	[FIX] Wrong Memcache file path for Windows based systems	2014-03-27 21:07:53 +02:00