Search Changesets

MantisBT: master 123c523d

2017-01-11 08:12:47

dregad

Details Diff
Merge remote-tracking branch 'origin/master-2.0.x'

Exlusion of parsedown library in .gitignore was intentionally not
applied, as this was only added in older branches to facilitate
switching after adding the new submodule.

Conflicts
.gitignore
mod - .gitignore Diff File
mod - core/database_api.php Diff File
mod - core/helper_api.php Diff File