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

..

_follow_button.html.haml

Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)

2018-04-08 13:40:22 +02:00

_follow_grid.html.haml

Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)

2018-04-08 13:40:22 +02:00

_grid_card.html.haml

Enable custom emojis in profiles (notes, field values, display names) (#7374)

2018-05-06 11:48:51 +02:00

_header.html.haml

Merge branch 'master' into glitch-soc/master

2018-05-10 00:03:28 +02:00

_moved_strip.html.haml

Enable custom emojis in profiles (notes, field values, display names) (#7374)

2018-05-06 11:48:51 +02:00

_nothing_here.html.haml

Localizations for most server-side strings

2016-11-16 00:55:33 +01:00

_og.html.haml

Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)

2018-03-18 20:33:07 +01:00

show.html.haml

Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)

2018-03-18 20:33:07 +01:00