]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/Disqus/locale/nb/LC_MESSAGES/Disqus.po
Merge branch '1.0.x' into testing
authorEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 13:20:32 +0000 (09:20 -0400)
committerEvan Prodromou <evan@status.net>
Thu, 17 Mar 2011 13:20:32 +0000 (09:20 -0400)
commit7cf12f093ed48849ec901038b4cfd44595343c06
tree80ebb30a8575054dc609a3bbea2c95f467ec6ba8
parent6b5d183bac5a22aa68f3b4c9aa9b9c471e2a99e4
parenta9f556795b5154fbb2880d816b83bee68b242bdb
Merge branch '1.0.x' into testing

Conflicts:
lib/common.php