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

..

admin

Improve report layout (#7188)

2018-04-20 02:28:48 +02:00

settings

…

application_helper.rb

Improve report layout (#7188)

2018-04-20 02:28:48 +02:00

flashes_helper.rb

…

home_helper.rb

…

instance_helper.rb

…

jsonld_helper.rb

Slightly reduce RAM usage (#7301)

2018-05-02 18:58:48 +02:00

mailer_helper.rb

…

routing_helper.rb

…

settings_helper.rb

Add Corsican localization (#7390)

2018-05-07 01:34:19 +02:00

stream_entries_helper.rb

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

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