]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'mobile-style' of git://gitorious.org/laconica/meitar into review
authorSarven Capadisli <csarven@controlyourself.ca>
Tue, 17 Feb 2009 20:32:19 +0000 (20:32 +0000)
committerSarven Capadisli <csarven@controlyourself.ca>
Tue, 17 Feb 2009 20:32:19 +0000 (20:32 +0000)
commit2eb6a6a9b02b51d9c8aa2f7bcff559681dd33b90
tree7067e5f771c81a74bb5954c9b5149ce655716d81
parentdfd08519d6cd7719290d2652394eeadbb4704f80
parent07c6537898a7c839469b50121b6c6d63be07613c
Merge branch 'mobile-style' of git://gitorious.org/laconica/meitar into review

Conflicts:

lib/action.php
config.php.sample
lib/action.php