diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-02-21 18:53:51 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-02-21 18:53:51 +0100 |
| commit | d012ef7d2a1019a89c7fbd8c2479d7c1ed10b526 (patch) | |
| tree | 7c90009354601ab34473b4d6d376e4b73c45e3f7 /inc/confutils.php | |
| parent | 84a355b61e53b5d8969c030679612a7b456777e9 (diff) | |
| parent | 3240c7a0b3414f926ee76b2c4fff0a95ab33e916 (diff) | |
| download | rpg-d012ef7d2a1019a89c7fbd8c2479d7c1ed10b526.tar.gz rpg-d012ef7d2a1019a89c7fbd8c2479d7c1ed10b526.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Conflicts:
inc/lang/bg/lang.php
Diffstat (limited to 'inc/confutils.php')
0 files changed, 0 insertions, 0 deletions