about summary refs log tree commit diff
path: root/lib/paperclip
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-12-08 13:17:14 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-12-08 13:17:14 +0000
commit776867ea73f2fb9180a90b09cd98d801ca2aeef0 (patch)
treed70b9579d4e6e0e737f62864743f9ea75111804b /lib/paperclip
parent717b7d555c39b71089ad01f86e8b26f09f8b61d2 (diff)
parentdad0a096752ca2aed0a12d5fa6f4443124804e7c (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'lib/paperclip')
0 files changed, 0 insertions, 0 deletions