SteveGilvarry b79c2c1604 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch ...

Conflicts:
	web/skins/classic/views/event.php
	web/skins/classic/views/timeline.php

Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.

2014-12-25 08:24:48 +10:00

..

actions.php

fix saving groups

2014-11-25 14:29:15 -05:00

config.php.in

Merge branch 'mysql2PDO'

2014-03-20 16:48:03 -04:00

control_functions.php

more updates

2013-12-17 11:16:20 -05:00

database.php

fixes WRT to db logging. I believe fixes issue #504

2014-09-26 14:43:58 -04:00

functions.php

Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch

2014-12-25 08:24:48 +10:00

lang.php

Update lang.php

2013-08-16 12:05:33 +02:00

logger.php

remove unneccessary quoting and escaping

2013-12-06 15:51:36 -05:00

Makefile.am

Migrate svn to git

2013-03-17 00:45:21 +01:00