MantisBT: master-2.0.x e84d0da8

Author Committer Branch Timestamp Parent
dregad dregad master-2.0.x 2017-01-15 02:05 master-2.0.x 69f70d4a
Changeset

Merge remote-tracking branch 'origin/master-1.3.x'

Conflicts:
admin/install.php
config_defaults_inc.php

mod - admin/install.php Diff File
mod - config/.htaccess Diff File
mod - config_defaults_inc.php Diff File
mod - core/.htaccess Diff File
mod - doc/.htaccess Diff File
mod - lang/.htaccess Diff File
mod - library/.htaccess Diff File
mod - library/README.md Diff File
mod - library/securimage Diff File
mod - plugins/.htaccess Diff File
mod - scripts/.htaccess Diff File