David Yip 991371af5f Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
	db/schema.rb

2018-01-09 14:16:45 -06:00

..

_content_spoiler.html.haml

Merge upstream!! #64 <3 <3

2017-07-12 02:03:17 -07:00

_detailed_status.html.haml

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2017-12-12 02:54:13 -06:00

_media.html.haml

Images now behind CWs on static pages

2017-06-29 22:59:28 -07:00

_og_description.html.haml

Clean up and improve generated OpenGraph tags (#4901)

2017-09-12 05:39:38 +02:00

_og_image.html.haml

Fix #5050 - Use summary_large_image only with media attachments (#5219)

2017-10-04 19:06:23 +02:00

_simple_status.html.haml

add duck beaks in haml

2017-10-11 21:34:00 +02:00

_status.html.haml

Pinned statuses (#4675)

2017-08-25 01:41:18 +02:00

embed.html.haml

Update status embeds (#4742)

2017-08-30 10:23:43 +02:00

show.html.haml

Fix #6204: Use content warning for page title when present (#6231)

2018-01-09 19:34:58 +01:00