diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-15 23:13:18 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-15 23:13:18 +0100 |
commit | a2696cf54284107b3ac846d5ac311f5d471022fd (patch) | |
tree | 99af4a2c5355dc7ad3fa39ed828332db24bda799 /config/initializers/timeout.rb | |
parent | 74ae158c2f7b7d282ce1cc754ac83d27467a7215 (diff) | |
parent | 6be7bde24378bcb034552248021ea2450bb10524 (diff) |
Merge branch 'marrus-sh-mastodon-site-api'
Diffstat (limited to 'config/initializers/timeout.rb')
0 files changed, 0 insertions, 0 deletions