]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'testing' into 1.0.x
authorEvan Prodromou <evan@status.net>
Tue, 7 Jun 2011 20:04:49 +0000 (16:04 -0400)
committerEvan Prodromou <evan@status.net>
Tue, 7 Jun 2011 20:04:49 +0000 (16:04 -0400)
commita10edb3183928d40c0567ea912a2530ebfb17683
tree4ccfcd0f1a0b7df7015dc30df5454f4c85b53552
parente499939c6c0503d6014d56f2117257752c04842e
parent8b9a5f550b9118f41ebe9eefb45cbb61d615f210
Merge branch 'testing' into 1.0.x

Conflicts:
plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
locale/eo/LC_MESSAGES/statusnet.po
plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
plugins/Directory/locale/tl/LC_MESSAGES/Directory.po