diff options
author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-10 22:44:37 +0100 |
---|---|---|
committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-10 22:44:37 +0100 |
commit | 8a886920b8930b64402e23fe81cf4e57078b795c (patch) | |
tree | 27a251dd797c9981747c9edf5e55139bd704c974 /app/views/config_polycom/settings.xml.erb | |
parent | 48accca73c9564bd2ee8bd296d47eb5c27dbcd51 (diff) | |
parent | 49738b091eea2ca65d6f8c71b88747e314ec2950 (diff) |
Merge branch 'caching' into develop
Diffstat (limited to 'app/views/config_polycom/settings.xml.erb')
0 files changed, 0 insertions, 0 deletions