Merge branch 'master' into glitch-soc/merge-upstream

Browse Source

Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb

...

This commit is contained in:

Thibaut Girka

2019-09-30 12:23:57 +02:00

parent febcdad2e2 3babf8464b

commit 16ff7c5627

352 changed files with 7151 additions and 2269 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

720

yarn.lock

File diff suppressed because it is too large Load Diff