]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch 'takeshitakenji/gnu-social-twitter-repeat-config' into mmn_fixes
authorMikael Nordfeldth <mmn@hethane.se>
Tue, 11 Jul 2017 20:09:12 +0000 (22:09 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Tue, 11 Jul 2017 20:09:12 +0000 (22:09 +0200)
1  2 
lib/framework.php
plugins/TwitterBridge/twitter.php

Simple merge
Simple merge