Merge remote-tracking branch 'remotes/origin/3.1.x' into 3.2.x · phpbb-de/phpbb-translation@6623310 · GitHub

Commit

Merge remote-tracking branch 'remotes/origin/3.1.x' into 3.2.x

Browse files

# Conflicts:
#	README.md

Loading branch information

gn36 committed Jan 9, 2018

2 parents a6d0841 + eee6125 commit 6623310