]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Fix merges.
authorAdrian Lang <mail@adrianlang.de>
Sat, 19 Sep 2009 19:38:52 +0000 (21:38 +0200)
committerAdrian Lang <mail@adrianlang.de>
Sat, 19 Sep 2009 19:38:52 +0000 (21:38 +0200)
commit8548e1185deac0a289e16ea48a64f323c3bec679
tree15084027d1f1e95fb7f890686108f61b519fd1d8
parent83e232bd3f9f58f4d670bcf1e579fb65293096c6
Fix merges.
actions/finishremotesubscribe.php
actions/updateprofile.php