mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-26 21:53:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/lib
History
Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
2019-05-10 17:09:12 +02:00
..
assets Add emoji autosuggest (#5053) 2017-09-23 14:47:32 +02:00
devise Fix wrong string being used on login failure when using LDAP (#8534) 2018-09-01 03:35:37 +02:00
generators Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
json_ld Preload common JSON-LD contexts (#9412) 2018-12-02 16:46:13 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-05-10 17:09:12 +02:00
paperclip Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
templates Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
cli.rb Add tootctl cache clear (#10689) 2019-05-04 01:02:57 +02:00