diff options
author | Nils Adermann <naderman@naderman.de> | 2014-10-26 12:43:17 -0700 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2014-10-26 12:43:17 -0700 |
commit | c19ab584202f7ec5b5fbd04ad83b2cba0964c184 (patch) | |
tree | d940cad8fb4b13d5543766cd98b415c8ac2da591 /phpBB/includes/functions.php | |
parent | 69cf5782d40c5e5746c93a768868b594a30bf157 (diff) | |
parent | 7f347a290c025aef1c6da8373c6ef1797774435b (diff) | |
download | forums-c19ab584202f7ec5b5fbd04ad83b2cba0964c184.tar forums-c19ab584202f7ec5b5fbd04ad83b2cba0964c184.tar.gz forums-c19ab584202f7ec5b5fbd04ad83b2cba0964c184.tar.bz2 forums-c19ab584202f7ec5b5fbd04ad83b2cba0964c184.tar.xz forums-c19ab584202f7ec5b5fbd04ad83b2cba0964c184.zip |
Merge branch 'prep-release-3.1.0' into develop-ascraeus
* prep-release-3.1.0:
[ticket/13221] Add bot_update as a dependency to gold
[ticket/13221] Perform bot updates after user table changes
Diffstat (limited to 'phpBB/includes/functions.php')
0 files changed, 0 insertions, 0 deletions