forked from GNUsocial/gnu-social
a7c85bebd5
Conflicts: actions/api.php actions/deletenotice.php actions/recoverpassword.php actions/remotesubscribe.php actions/tag.php actions/tagrss.php actions/twitapiaccount.php actions/twitapiusers.php classes/Notice.php classes/User.php lib/common.php lib/language.php lib/subs.php lib/twitterapi.php lib/util.php scripts/inbox_users.php scripts/update_translations.php Merged development trunk into laconica head. woohoo! |
||
---|---|---|
.. | ||
carrier.sql | ||
foreign_services.sql | ||
laconica_pg.sql | ||
laconica.sql |