]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
Merge remote branch 'origin/moveaccount' into moveaccount
authorEvan Prodromou <evan@status.net>
Mon, 17 Jan 2011 21:04:46 +0000 (16:04 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 17 Jan 2011 21:04:46 +0000 (16:04 -0500)
commit64750a6455948a57f8e669f898ad5f613f43ba49
treee56ae53ccc9ec22ccef868e3a1ce823f31bef758
parent6d429ce3579fbbaef120140f4c2c5eae5a2bccf5
parentea8b086cb2b9ae42eb2a165786ee7aa7f3224283
Merge remote branch 'origin/moveaccount' into moveaccount

Conflicts:
lib/accountmover.php