beatrix e7edb4d1ee Merge pull request #87 from tootsuite/master ... merge upstream		2017-07-20 11:24:32 -04:00
..
environments	Updated from tootsuite	2017-07-17 20:03:57 +02:00
initializers	Correct OStatus inflection (Ostatus -> OStatus) (#4255)	2017-07-19 01:37:26 +02:00
locales	i18n: @716f4cb (pl) (#4266)	2017-07-19 10:49:36 +02:00
webpack	Fix for stylesheet split	2017-07-18 11:28:52 -07:00
application.rb	Merge upstream!! #64 <3 <3	2017-07-12 02:03:17 -07:00
boot.rb	…
brakeman.ignore	…
database.yml	fix unnecessary variable (#3947)	2017-06-25 23:29:22 +02:00
deploy.rb	…
environment.rb	…
i18n-tasks.yml	…
navigation.rb	Rename "Credentials" page to "Security" for clarity (#3941)	2017-06-25 22:13:02 +02:00
puma.rb	…
routes.rb	Merge pull request #87 from tootsuite/master	2017-07-20 11:24:32 -04:00
secrets.yml	…
settings.yml	Merge upstream (#81)	2017-07-15 14:33:15 -07:00
sidekiq.yml	Bind web UI access tokens to sessions (#3940)	2017-06-25 23:51:32 +02:00
webpacker.yml	Fix webpack-dev-server on Windows (#4000)	2017-06-30 13:43:26 +02:00