]> git.mxchange.org Git - friendica.git/commit
Merge branch '2018.12-rc' into task/6208-escape-html-true
authorHypolite Petovan <hypolite@mrpetovan.com>
Tue, 18 Dec 2018 13:36:36 +0000 (08:36 -0500)
committerGitHub <noreply@github.com>
Tue, 18 Dec 2018 13:36:36 +0000 (08:36 -0500)
commit21a055f670149e67f2ad03da43f590c5329822e2
tree14e9b385a6557008e81bd588254c53df0ef99dda
parentfe3470d7c1f5503e4b3e5889ba97015cc8429e5b
parent091193ad645b6583e0391399ccd528339fc95683
Merge branch '2018.12-rc' into task/6208-escape-html-true
view/theme/frio/templates/contact_edit.tpl
view/theme/frio/templates/settings/oauth_edit.tpl