mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-19 00:21:40 +01:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
2018-02-09 09:25:53 -06:00
..
controllers
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-02-09 09:25:53 -06:00
helpers
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-01-28 22:45:17 -06:00
javascript
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-02-09 09:25:53 -06:00
lib
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-02-09 09:25:53 -06:00
mailers
Make sure status is not nil (#6428)
2018-02-04 12:31:46 +01:00
models
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-02-09 09:25:53 -06:00
policies
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-02 14:17:11 +00:00
presenters
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2017-12-06 20:17:13 +00:00
serializers
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-02-09 09:25:53 -06:00
services
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
2018-02-02 08:39:52 -06:00
validators
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-02-04 16:36:19 -06:00
views
Merge remote-tracking branch 'origin/master' into merge-upstream
2018-02-09 09:25:53 -06:00
workers
Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
2018-01-22 14:25:09 +01:00