Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb

2019-07-23 10:51:07 +02:00

..

about.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00

application.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00

common.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00

error.js

Change error graphic to hover-to-play (#10055)

2019-02-15 23:33:25 +01:00

public.js

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

2019-07-23 10:51:07 +02:00

share.js

Upgrade webpack to version v4.x (#6655)

2018-07-14 03:56:41 +02:00