5 Commits

Author	SHA1	Message	Date
rog1121	06a033dd71	Permissions again	2014-03-01 18:07:44 -07:00
rog1121	787ad972ec	site_assets Permissions	2014-03-01 18:06:37 -07:00
rog1121	93981f6044	Various Fixes	2014-03-01 17:57:43 -07:00
rog1121	7e3623d659	Various Fixes	2014-03-01 17:56:23 -07:00
Sebastian Grewe	ee02445b7d	Merge branch 'issue-965' into next ... Conflicts: public/templates/mpos/master.tpl	2013-12-31 16:27:16 +01:00