diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-03-15 22:55:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 22:55:22 +0100 |
| commit | e245115f47082ffba27205f508301d14e792c369 (patch) | |
| tree | 21a77b788dace45b734da6e64f1b0705016192f0 /config/initializers/timeout.rb | |
| parent | 620f70e42c16c324459ca2da52c68f1def8683de (diff) | |
| parent | c1124228e857b0e85f5bf927d2c41c7fadfdf955 (diff) | |
Merge branch 'master' into mastodon-site-api
Diffstat (limited to 'config/initializers/timeout.rb')
0 files changed, 0 insertions, 0 deletions