Files
Grav-Admin-Plugin/admin.php
Andy Miller 2f94c936ad Merge branch 'feature/simple-icon-picker' into develop
# Conflicts:
#	themes/grav/js/admin.min.js
#	themes/grav/js/vendor.min.js
2017-08-15 16:00:25 -06:00

28 KiB