mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-27 22:23:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app
History
Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
2019-09-18 17:25:56 +02:00
..
chewy Add more accurate hashtag search (#11579) 2019-08-18 03:45:51 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
mailers Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-09-13 18:13:43 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-09-18 17:25:56 +02:00