mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-28 14:43:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app
History
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb

Resolved by taking both changes (not a real conflict, just changes too close
to each other).
2018-11-27 13:23:02 +01:00
..
chewy Get rid of Chewy order/limit warning (#8355) 2018-08-22 02:44:56 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
mailers Fix low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2018-11-09 14:56:31 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
workers Optimize the process of following someone (#9220) 2018-11-08 21:05:42 +01:00