• MediaFormat's avatar
    Merge branch 'feature/emoji' · 4cf3f965
    MediaFormat authored
    * feature/emoji:
      Hide pixelfed widget when oauth fails
      Add emoji support
    
    # Conflicts:
    #	fediembedi-mastodon-widget.php
    #	templates/mastodon.tpl.php
    #	templates/pixelfed.tpl.php
    4cf3f965
mastodon.tpl.php 6.29 KB