MantisBT: master aa0238a6

Diff Back to Repository
Author Committer Branch Timestamp Parent
vboctor vboctor master 2016-12-30 10:15 master a246e29c
Changeset

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

Conflicts:

core/constant_inc.php

doc/CREDITS

docbook/Admin_Guide/en-US/Revision_History.xml

docbook/Developers_Guide/en-US/Revision_History.xml

my_view_page.php
mod - config_defaults_inc.php Diff File