summaryrefslogtreecommitdiff
path: root/app/views/config_polycom/settings.xml.erb
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-16 21:47:37 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-16 21:47:37 +0100
commita518270dbafa6eb9265c4124ca2887149c3de362 (patch)
tree0fee7e664d57b2b057d556f0d3ac6fd29737ee52 /app/views/config_polycom/settings.xml.erb
parent9ffaaeeb42b364f2c7d9b7d17a272c530f546c83 (diff)
parent046ce09895a08778c971052f6d22ecd6422aee6d (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/config_polycom/settings.xml.erb')
0 files changed, 0 insertions, 0 deletions