MantisBT: master a272bafe

Author Committer Branch Timestamp Parent
dregad dregad master 2016-09-17 18:32:38 master 253843ac
Changeset

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

Conflicts:
core/html_api.php
login_page.php
lost_pwd.php
lost_pwd_page.php
signup.php
signup_page.php
verify.php

mod - core/filter_api.php Diff File