diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-21 17:17:20 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-21 17:17:20 +0000 |
| commit | 6290cd796937e8bfb43ab360a578ac42f53afda9 (patch) | |
| tree | 5123d546ae516640c57c1d4f1047663e8c733343 /config/initializers/oj.rb | |
| parent | 2649cce3a065f3825d63b7f7be341787aa1d2f9a (diff) | |
| parent | d97903a3587e137316adbd8a9f0460552b5bfbcd (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/initializers/oj.rb')
0 files changed, 0 insertions, 0 deletions