summaryrefslogtreecommitdiff
path: root/locale/en_GB
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-08-16 10:06:52 -0700
committerBrion Vibber <brion@pobox.com>2010-08-16 10:06:52 -0700
commitb77c029aa811e08027d6dc8ed7d46be397eb6fb3 (patch)
treefac7f311276c9b7a6695ed3fc4962d6ec715216d /locale/en_GB
parent029aa0c61c9942c0688fd3dc9aa2893311543db1 (diff)
parent7f9ab683b259fc93d507eb705c84af0cfd2fae5b (diff)
Merge branch 'testing'
Conflicts: plugins/OStatus/classes/Ostatus_profile.php
Diffstat (limited to 'locale/en_GB')
0 files changed, 0 insertions, 0 deletions