1
0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-07-12 17:16:18 +02:00
Commit Graph

2 Commits

Author SHA1 Message Date
d4f57e35d3 Fix: JSON.parse: unexpected character 2014-01-19 18:51:29 +04:00
fb121a88d1 Merge branch 'dev' of https://github.com/metalgvc/monstra-cms into metalgvc-dev
Conflicts:
	plugins/box/filesmanager/views/backend/index.view.php
2014-01-18 11:14:21 +02:00