]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge conflicts and kill a whole lot of trailing whitespace on lines.
authorMike Cochrane <mikec@mikenz.geek.nz>
Wed, 9 Jul 2008 22:46:30 +0000 (18:46 -0400)
committerMike Cochrane <mikec@mikenz.geek.nz>
Wed, 9 Jul 2008 22:46:30 +0000 (18:46 -0400)
commit4b656f47dff2bd6eed4dcfad060b8434d052d883
tree6acc353a739f712ecbca9d825dcb7fa16f429ff1
parent67921b1c1871e881f71f8f15aa7fc9c2b11da64d
Merge conflicts and kill a whole lot of trailing whitespace on lines.

darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz
31 files changed:
actions/accesstoken.php
actions/finishimmediate.php
actions/login.php
actions/newnotice.php
actions/publicxrds.php
actions/register.php
actions/remotesubscribe.php
actions/showstream.php
classes/Avatar.php
classes/Confirm_address.php
classes/Consumer.php
classes/Nonce.php
classes/Notice.php
classes/Profile.php
classes/Queue_item.php
classes/Remember_me.php
classes/Remote_profile.php
classes/Reply.php
classes/Sms_carrier.php
classes/Subscription.php
classes/Token.php
classes/User.php
classes/User_openid.php
db/laconica.sql
fixup_replies.php
lib/action.php
lib/jabber.php
lib/oauthstore.php
lib/omb.php
lib/stream.php
lib/util.php