Andy Miller d2b76ba93a Merge branch 'develop' into feature/work-on-languages-workflow ...

Conflicts:
	classes/controller.php

2015-08-20 18:15:09 -06:00

..

admin.php

various fixes for redirects and parents

2015-08-20 18:11:54 -06:00

controller.php

various fixes for redirects and parents

2015-08-20 18:11:54 -06:00

gpm.php

Added isSymlink logic to determine if Grav is symbolically linked or not.

2015-08-07 13:31:15 -07:00

popularity.php

Move translate function so it's accessible from all admin parts. Correctly change $l->translate() calls to it

2015-08-14 15:05:33 +02:00