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/views/switchboard_entries/edit.html.haml | |
| 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/views/switchboard_entries/edit.html.haml')
| -rw-r--r-- | app/views/switchboard_entries/edit.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/switchboard_entries/edit.html.haml b/app/views/switchboard_entries/edit.html.haml new file mode 100644 index 0000000..8885e25 --- /dev/null +++ b/app/views/switchboard_entries/edit.html.haml @@ -0,0 +1,3 @@ +- content_for :title, t("switchboard_entries.edit.page_title") + += render "form"
\ No newline at end of file |