Isaac Connor 463d8a136f Merge branch 'master' into mysql2PDO ... Conflicts: zm.conf.in		2013-11-08 11:22:09 -05:00
..
ajax	clean out autogenerated files	2013-09-12 14:43:57 -04:00
css	clean out autogenerated files	2013-09-12 14:43:57 -04:00
graphics	clean out autogenerated files	2013-09-12 14:43:57 -04:00
includes	clean out autogenerated files	2013-09-12 14:43:57 -04:00
js	increase the hegiht of the window a bit, the contents are larger	2013-09-23 10:03:33 -04:00
lang	clean out autogenerated files	2013-09-12 14:43:57 -04:00
views	Merge branch 'master' into mysql2PDO	2013-11-08 11:22:09 -05:00
Makefile.am	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00
skin.php	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00
svn-commit.tmp	Migrate svn to git	2013-03-17 00:45:21 +01:00