You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		6 years ago
..
admin	Prevent actions log from crashing when displaying deleted status (fixes #8133) (#8219)	6 years ago
settings	…
application_helper.rb	…
flashes_helper.rb	…
home_helper.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	6 years ago
instance_helper.rb	…
jsonld_helper.rb	…
mailer_helper.rb	…
routing_helper.rb	…
settings_helper.rb	i18n: fix Slovak language name (#8169)	6 years ago
stream_entries_helper.rb	Redesign public profiles and toots (#8068)	6 years ago