summaryrefslogtreecommitdiffstats
path: root/merge.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-11-27 18:00:15 +0000
committerGerrit Code Review <review@openstack.org>2013-11-27 18:00:15 +0000
commitb1b60b258706137ce6c28d1bc03f5b19b044f289 (patch)
tree84273bd26e0ad21134ba57abcd0a9198b290c69b /merge.py
parentdbda731e48f6bb29cd40cfa774a751c2566b6297 (diff)
parentb9198ad03a824a12e6b5331f1995473257fb0665 (diff)
Merge "Fix case of OpenStack in templates."
Diffstat (limited to 'merge.py')
0 files changed, 0 insertions, 0 deletions