diff options
| author | Lorenz Diener <[email protected]> | 2016-11-25 20:57:53 +0100 |
|---|---|---|
| committer | Lorenz Diener <[email protected]> | 2016-11-25 20:57:53 +0100 |
| commit | ab5889404144834b2671d2d25b207fe761418d5c (patch) | |
| tree | 0bd05a5cd7d233b102cbf89176b88bf2af92ad5e /setup.cfg | |
| parent | e4e3a8eb93721bf12e4a5b2bf45dc3c2a473dc6f (diff) | |
| parent | b958ce54ba32968ef159bda91c8f480c74374f68 (diff) | |
| download | mastodon.py-ab5889404144834b2671d2d25b207fe761418d5c.tar.gz | |
Merge remote-tracking branch 'refs/remotes/origin/master' into ratelimits
# Conflicts:
# mastodon/Mastodon.py
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions