diff options
author | Adrian Lang <mail@adrianlang.de> | 2011-05-08 20:55:40 +0200 |
---|---|---|
committer | Adrian Lang <mail@adrianlang.de> | 2011-05-08 20:55:40 +0200 |
commit | 9199737c351d653a1d384cb50ed0d185f6512826 (patch) | |
tree | 2da4dbc0b92a72c767712549b6d90f53b0a3605e /doku.php | |
parent | e68653d8ef3df043761e4042c563d65731f9b9c6 (diff) | |
parent | 2b537ba8dc1863d603770c208ae4f91d4d0877b9 (diff) | |
download | rpg-9199737c351d653a1d384cb50ed0d185f6512826.tar.gz rpg-9199737c351d653a1d384cb50ed0d185f6512826.tar.bz2 |
Merge branch 'master' into stable
Conflicts:
doku.php
Diffstat (limited to 'doku.php')
-rw-r--r-- | doku.php | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7,7 +7,7 @@ */ // update message version -$updateVersion = 31; +$updateVersion = 32; // xdebug_start_profiling(); |