diff options
author | Nils Adermann <naderman@naderman.de> | 2012-09-01 16:11:57 +0200 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2012-09-01 16:11:57 +0200 |
commit | d866624ea7cbc4ff8e5515f66dbb984cbd565414 (patch) | |
tree | 66479290c045229f3f543edafe8bbbc558fdd3e3 /phpBB/includes/diff/engine.php | |
parent | 790e64433d26da1e819c9eaa96ad812c402286db (diff) | |
parent | 0ba2bfffe2df64e1f67ec23061365cdac2238a34 (diff) | |
download | forums-d866624ea7cbc4ff8e5515f66dbb984cbd565414.tar forums-d866624ea7cbc4ff8e5515f66dbb984cbd565414.tar.gz forums-d866624ea7cbc4ff8e5515f66dbb984cbd565414.tar.bz2 forums-d866624ea7cbc4ff8e5515f66dbb984cbd565414.tar.xz forums-d866624ea7cbc4ff8e5515f66dbb984cbd565414.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10873] Change language for notice about undelivered, deleted PM.
Diffstat (limited to 'phpBB/includes/diff/engine.php')
0 files changed, 0 insertions, 0 deletions