fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-17 15:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/lib
History
David Yip 8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream 
Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
5bf5003384.
It was resolved by accepting tootsuite's changes.
2018-06-07 05:13:49 -05:00
..
assets Add emoji autosuggest (#5053) 2017-09-23 14:47:32 +02:00
devise Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845) 2018-03-20 19:41:51 +01:00
mastodon Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-06-07 05:13:49 -05:00
paperclip Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 00:17:17 +00:00
tasks Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-06-07 05:13:49 -05:00
templates/haml/scaffold Adding simple_form, adding profile settings, header image 2016-03-12 20:47:22 +01:00