summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/application.js
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-22 12:33:44 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2012-12-22 12:33:44 +0100
commit65f95f2b6b8bca179c1db20cfb1769738f0b9d9b (patch)
tree49695b7ea1d4c207f3fc9ea56ada0d35086a5334 /app/assets/javascripts/application.js
parent77a3c41cbb7edb93dcc98b7ae18a1b58e0d2d2ef (diff)
parentbc4e559c08616de312906903a1c89eb74d09ffd7 (diff)
Merge branch 'feature/show_sip_account_in_acd' into develop
Diffstat (limited to 'app/assets/javascripts/application.js')
0 files changed, 0 insertions, 0 deletions