Isaac Connor b08a8252c4 Merge branch 'dukess-master' into v1.26.4-beta ... Conflicts: scripts/zmupdate.pl.in		2013-09-18 13:03:54 -04:00
..
Makefile.am	Migrate svn to git	2013-03-17 00:45:21 +01:00
actions.php	Update actions.php	2013-09-13 03:48:01 -07:00
config.php.in	Migrate svn to git	2013-03-17 00:45:21 +01:00
control_functions.php	Migrate svn to git	2013-03-17 00:45:21 +01:00
database.php	Migrate svn to git	2013-03-17 00:45:21 +01:00
functions.php	Rewritten the query to allow mysql to use indexes	2013-09-12 22:46:26 +02:00
lang.php	Migrate svn to git	2013-03-17 00:45:21 +01:00
logger.php	Migrate svn to git	2013-03-17 00:45:21 +01:00