diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-10 18:30:41 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-10 18:59:53 +0200 |
| commit | 1b0ff4cd69b00f0d2613be45cc233e25dc1a0d05 (patch) | |
| tree | 1b67879adb426809f3e00102fc2f97a8118b011e /.env.test | |
| parent | b45f555a0c7a7d50ed7640b938eb8b5a671a0e10 (diff) | |
| parent | 8514ef723c3e3963567a9d57bd0d71a5091fc802 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb
Diffstat (limited to '.env.test')
0 files changed, 0 insertions, 0 deletions