diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-07 00:17:14 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-07 00:17:14 +0000 |
| commit | c63e6c9a2ca064a8ff65c8558f38abe9ab037620 (patch) | |
| tree | b02eaa308572492ab5305e3972e8d07015f00d17 /app/controllers/about_controller.rb | |
| parent | 061211a1e3bd4cb6af45fda47cd8be2f53ebfbac (diff) | |
| parent | 9302369aa5648bab42a2cd6078607d7cbaa92458 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/about_controller.rb')
0 files changed, 0 insertions, 0 deletions