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
..
classic	Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch	2014-12-25 08:24:48 +10:00
flat	Merge pull request #620 from SteveGilvarry/11-php-short-tags	2014-12-08 14:39:24 -05:00
Makefile.am	add flat to the subdirs	2014-12-01 15:57:44 -05:00