Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
f8e07ca5cdd0d4203d31aa5f0fce79690d5a5190
mastodon/lib
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
..
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
mastodon
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-27 13:23:02 +01:00
paperclip
Unconditionally re-encode locally-uploaded images to strip metadata
2018-09-17 21:09:59 +02:00
tasks
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-05 15:23:57 +02:00
templates
Add post-deployment migration system (#8182)
2018-08-13 18:17:20 +02:00
cli.rb
Do not remove "dead" domains in tootctl accounts cull (#9108)
2018-10-27 22:56:16 +02:00