mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/lib
History
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon 
# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb
 		2018-02-23 23:28:31 +09:00
..
assets Add emoji autosuggest (#5053) 2017-09-23 14:47:32 +02:00
json_ld Use updated ActivityStreams context (added: sharedInbox) (#4764) 2017-09-02 14:00:58 +02:00
mastodon Bump version to 2.2.0 2018-01-29 01:12:36 +01:00
paperclip Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
tasks Merge branch 'master' of https://github.com/tootsuite/mastodon 2018-02-23 23:28:31 +09:00
templates/haml/scaffold Adding simple_form, adding profile settings, header image 2016-03-12 20:47:22 +01:00