diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-10 08:45:30 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-03-10 08:45:30 +0100 |
| commit | e2a03b5d20253d7a1eb10b8c110d9feec79e995f (patch) | |
| tree | cc36cbb2572e549ce59388654d358cb1e2771ecd /app/models/user_group_membership.rb | |
| parent | 595a48a91f8549b20109942e0b80df4f891d5999 (diff) | |
| parent | 21d0843117c0962bd962fc50fccaf276a5b3067f (diff) | |
Fixed a merging conflict.
Merge branch 'switchboard' into develop
Conflicts:
app/models/sip_account.rb
Diffstat (limited to 'app/models/user_group_membership.rb')
0 files changed, 0 insertions, 0 deletions