]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 28 Jan 2019 20:14:47 +0000 (21:14 +0100)
committerThibaut Girka <thib@sitedethib.com>
Mon, 28 Jan 2019 20:14:47 +0000 (21:14 +0100)
commit42713b97106ffbeb9406d1a7086082a172fc2141
treeb7e90b083ddb3f0db2f64692da363bad87e49d64
parente488faaa4ae18f33023b4661eeed0d7643cb9d9c
parent28866d329bafe676ba2c45e3b449be3d1ba6e9ce
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- README.md: kept our version
CONTRIBUTING.md
lib/mastodon/version.rb