djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/views/stream_entries
History
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
 		2018-05-10 00:03:28 +02:00
..
_content_spoiler.html.haml Merge upstream!! #64 <3 <3 2017-07-12 02:03:17 -07:00
_detailed_status.html.haml Enable custom emojis in profiles (notes, field values, display names) (#7374) 2018-05-06 11:48:51 +02:00
_media.html.haml Images now behind CWs on static pages 2017-06-29 22:59:28 -07:00
_more.html.haml Paginate descendant statuses in public page (#7148) 2018-04-23 19:27:35 +02:00
_og_description.html.haml Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) 2018-03-18 20:33:07 +01:00
_og_image.html.haml Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) 2018-03-18 20:33:07 +01:00
_simple_status.html.haml Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
_status.html.haml Enable custom emojis in profiles (notes, field values, display names) (#7374) 2018-05-06 11:48:51 +02:00
embed.html.haml Update status embeds (#4742) 2017-08-30 10:23:43 +02:00
show.html.haml Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) 2018-03-18 20:33:07 +01:00