summaryrefslogtreecommitdiff
path: root/test/functional/sip_accounts_controller_test.rb
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-10 08:45:30 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-10 08:45:30 +0100
commite2a03b5d20253d7a1eb10b8c110d9feec79e995f (patch)
treecc36cbb2572e549ce59388654d358cb1e2771ecd /test/functional/sip_accounts_controller_test.rb
parent595a48a91f8549b20109942e0b80df4f891d5999 (diff)
parent21d0843117c0962bd962fc50fccaf276a5b3067f (diff)
Fixed a merging conflict.
Merge branch 'switchboard' into develop Conflicts: app/models/sip_account.rb
Diffstat (limited to 'test/functional/sip_accounts_controller_test.rb')
0 files changed, 0 insertions, 0 deletions