Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml		2018-08-31 19:10:57 +02:00
..
account_avatar.rb
account_finder_concern.rb
account_header.rb	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
account_interactions.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-10 16:22:31 +02:00
attachmentable.rb	Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)	2018-07-03 19:47:09 +02:00
cacheable.rb
expireable.rb	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
omniauthable.rb
paginable.rb
relationship_cacheable.rb
remotable.rb	Fix nil host in remotable (#8508)	2018-08-29 21:13:49 +02:00
status_threading_concern.rb
streamable.rb