Merge branch 'master' into dev

Browse source

...

This commit is contained in:

OsaAjani 2016-01-23 15:25:42 +01:00

parent bdd7b3dccc 157f06c14e

commit b5fb0c3150

2 changed files with 5 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

0

templates/connect/login.php → templates/connect/default.php

Unescape Escape View file