butschster/kodicms — pull request #248 by mercury64 (2014-04-08 22:35:58+00:00)
Title: Fixed version for plugins. Will display default 0.0.0 if not set.

The files line endings are still messed a bit.
I think it is a Mac vs Linux line ending problem, as to why the diff shows every single line changed.
Only line 61 of cms/modules/plugins/classes/controller/api/plugins.php changed, and
only line 6 of cms/modules/plugins/media/js/controller/plugins.js changed.
Conflicts:
cms/modules/plugins/classes/controller/api/plugins.php
cms/modules/plugins/media/js/controller/plugins.js