020b40efdb
Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml |
||
|---|---|---|
| .. | ||
| about | ||
| accounts | ||
| admin | ||
| admin_mailer | ||
| application | ||
| auth | ||
| authorize_follows | ||
| errors | ||
| follower_accounts | ||
| following_accounts | ||
| home | ||
| invites | ||
| kaminari | ||
| layouts | ||
| notification_mailer | ||
| oauth | ||
| remote_follow | ||
| settings | ||
| shared | ||
| shares | ||
| stream_entries | ||
| tags | ||
| user_mailer | ||
| well_known | ||