20 commits

Author	SHA1	Message	Date
FloatingGhost	0f6bece60d	Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop	2022-01-08 21:45:12 +00:00
FloatingGhost	0d012ebea1	Revert "Merge branch 'remove/mastofe' into 'develop'" ... This reverts commit 6b3842cf50, reversing changes made to 6b1282a829.	2022-01-08 21:44:37 +00:00
sadposter	bd9c9136f9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2021-09-13 16:14:58 +01:00
Sean King	2de41770d0	Remove Twemoji stuff from MastoFE	2021-04-16 18:02:08 -06:00
sadposter	3aa25b008d	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2021-01-23 22:38:07 +00:00
Mark Felder	8864ac65c6	Add dinosaur gif from https://gifs.cc ... "Our animations are free to be used to enhance your website."	2021-01-05 13:25:14 -06:00
sadposter	77caabba17	resync	2020-05-25 15:13:28 +01:00
sadposter	3508f698b9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-03-03 11:16:59 +00:00
Haelwenn (lanodan) Monnier	2a850abbeb	MastoFE: Bundle 2020-01-20	2020-02-29 06:41:13 +01:00
sadposter	325372b1e1	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-08-07 08:59:31 +01:00
Hakaba Hitoyo	39c7bbe18f	Remove longfox emoji set	2019-08-04 04:32:45 +00:00
sadposter	febd2fdfd3	add emojo	2019-06-06 15:54:32 +01:00
sadposter	d19b99009b	add instance resources	2019-05-30 12:11:56 +01:00
sadposter	7f40b66d51	add emojo	2019-05-16 20:24:29 +01:00
sadposter	4c11429520	Add mayushii	2019-05-12 00:51:01 +01:00
optikfluffel	a907522690	used imageOptim to reduce size of image files	2019-03-19 10:10:48 +01:00
Haelwenn (lanodan) Monnier	83e3afac2c	Update mastodon frontend	2018-09-20 16:13:13 +00:00
Hakaba Hitoyo	7e1d4819ca	add longfox emojis	2018-01-27 08:38:48 +09:00
Roger Braun	3d1360c4d6	Add mastodon emoji folder.	2017-11-16 09:35:14 +01:00
Roger Braun	7c82b82197	Make emoji configurable in files.	2017-09-16 16:49:46 +02:00