mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2025-01-14 06:14:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app
History
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	.env.production.sample
	app/controllers/auth/confirmations_controller.rb
	db/schema.rb
2018-02-04 16:36:19 -06:00
..
controllers Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -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-04 16:36:19 -06:00
lib Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -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-04 16:36:19 -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 'tootsuite/master' into glitchsoc/master 2018-01-17 16:17:10 +00: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-04 16:36:19 -06:00
workers Rename ResolveRemoteAccountService to ResolveAccountService (#6327) 2018-01-22 14:25:09 +01:00