luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-25 08:13:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream 
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09 14:27:47 -05:00
..
environments Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
initializers Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
locales i18n: Improve Polish translation (#4783) 2017-09-02 20:45:20 +02:00
webpack Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
application.rb Merge remote-tracking branch 'upstream/master' 2017-08-07 22:43:52 +02:00
boot.rb
brakeman.ignore Update status embeds (#4742) 2017-08-30 10:23:43 +02:00
database.yml fix unnecessary variable (#3947) 2017-06-25 23:29:22 +02:00
deploy.rb Update Capistrano lock version in config/deploy.rb (#4352) 2017-07-25 01:14:01 +02:00
environment.rb Make PreviewCard records reuseable between statuses (#4642) 2017-09-01 16:20:16 +02:00
i18n-tasks.yml Shorten display of large numbers on public profiles (#4711) 2017-08-27 17:04:45 +02:00
navigation.rb Fix up the applications area (#4664) 2017-08-23 00:59:35 +02:00
puma.rb Do not set port for puma if it is bound to unix socket (#2289) 2017-04-22 01:22:20 +02:00
routes.rb Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
secrets.yml
settings.yml Merge upstream (#111) 2017-08-01 13:20:29 -07:00
sidekiq.yml Periodically remove expired PuSH subscribers (#4654) 2017-08-21 22:56:33 +02:00
webpacker.yml Fix webpack-dev-server on Windows (#4000) 2017-06-30 13:43:26 +02:00