diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-16 15:17:12 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-16 15:17:12 +0000 |
| commit | 05a2a70ca218879f17237e694394fab21f9cecd8 (patch) | |
| tree | c131acc0f4ba7a53d2d2d81bd75acf37716e1ce0 /config/initializers/oj.rb | |
| parent | e202efdf8a11a5e2fdcc029c46f972ca517f452e (diff) | |
| parent | a434d9c0cc89a0dd862c0f28825e1a1255e8a028 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/initializers/oj.rb')
0 files changed, 0 insertions, 0 deletions