summaryrefslogtreecommitdiff
path: root/service/pixelated
diff options
context:
space:
mode:
authorTulio Casagrande <tuliocasagrande@gmail.com>2017-01-04 17:55:25 -0200
committerGitHub <noreply@github.com>2017-01-04 17:55:25 -0200
commitf60c15ff047a2d96210e36b194f2a188b63ccbaf (patch)
tree1f24e9cff43026612d1079ae747a432702b739f9 /service/pixelated
parenteadeca57b9dbddd2f5bd0e859b145cfbe2f616a4 (diff)
parent391d2ff36f837ec293f4772efd7f6d64083004cd (diff)
Merge pull request #900 from bwagnerr/fix_test_site
Fixed mockito conflict with zope
Diffstat (limited to 'service/pixelated')
0 files changed, 0 insertions, 0 deletions