Isaac Connor 535a760f26 Merge branch 'master' into multi-server ... Conflicts: configure.ac		2015-09-16 09:12:55 -04:00
..
ajax	clean out autogenerated files	2013-09-12 14:43:57 -04:00
css	Merge pull request #1037 from pliablepixels/1036-flat-skin-grey-out-disabled-buttons	2015-08-25 12:50:50 -04:00
graphics	clean out autogenerated files	2013-09-12 14:43:57 -04:00
includes	put back mootools	2015-08-27 11:35:47 -04:00
js	Merge branch 'master' into multi-server	2015-08-19 13:30:48 -04:00
lang	clean out autogenerated files	2013-09-12 14:43:57 -04:00
views	Merge branch 'master' into multi-server	2015-09-16 09:12:55 -04:00
Makefile.am	Reverting my web changes in develop - keeping them in modern	2013-05-02 10:20:06 -04:00
skin.php	Fix builtin authentication issue caused by commit 6e5d927	2014-02-14 18:56:27 -06:00