David Yip a817f084ea

Merge remote-tracking branch 'tootsuite/master' ...

Conflicts:
 	app/controllers/statuses_controller.rb

2018-04-12 03:30:57 -05:00

..

development.rb

Provide default OTP_SECRET value for development environment (#6617)

2018-03-04 20:28:24 +01:00

production.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-20 19:17:20 +00:00

test.rb

update gem, test pam authentication (#7028)

2018-04-11 21:40:38 +02:00