Ondřej Hruška d69fa9e1f4 Merge changes from upstream with the CSS reload fix		2017-07-18 18:58:47 +02:00
..
environments	Updated from tootsuite	2017-07-17 20:03:57 +02:00
initializers	Improve ActivityPub representations (#3844)	2017-07-15 03:01:39 +02:00
locales	Update Japanese translations for new landing page (#4159)	2017-07-18 18:42:59 +02:00
webpack	split added glitch locales from vanilla (#82)	2017-07-16 01:15:25 +02: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 changes from upstream with the CSS reload fix	2017-07-18 18:58:47 +02: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