Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12761] Remove the execute bit from functions_user.php
This commit is contained in:
Andreas Fischer 2014-06-23 16:17:14 +02:00
commit b79aa2bf78

0
phpBB/includes/functions_user.php Executable file → Normal file
View file