Django Doucet 4cf3f9654a Merge branch 'feature/emoji' ... * feature/emoji: Hide pixelfed widget when oauth fails Add emoji support # Conflicts: # fediembedi-mastodon-widget.php # templates/mastodon.tpl.php # templates/pixelfed.tpl.php		2020-03-06 01:10:19 -05:00
..
mastodon.tpl.php	Merge branch 'feature/emoji'	2020-03-06 01:10:19 -05:00
peertube.tpl.php	Service registration refactor, Separate widgets, support for PeerTube	2020-01-26 23:35:03 -05:00
pixelfed.tpl.php	Merge branch 'feature/emoji'	2020-03-06 01:10:19 -05:00