Jaz Parkyn 61842f492f Merge remote-tracking branch 'refs/remotes/origin/master' into pr/32 ... # Conflicts: # source/administrator/components/com_jedchecker/language/en-GB/en-GB.com_jedchecker.ini # source/administrator/components/com_jedchecker/script.php		2016-10-03 23:20:07 +01:00
..
police.raw.php	Fixed case in classes and method names	2016-05-25 17:19:19 +01:00
uploads.php	Merge remote-tracking branch 'refs/remotes/origin/master' into pr/32	2016-10-03 23:20:07 +01:00