Merge branch 'develop' of github.com:martini/zammad into develop

This commit is contained in:
Martin Edenhofer 2013-08-11 11:16:00 +02:00
commit 1a4da30745

View file

@ -8,7 +8,7 @@ Presort of group (highest sort priority).
X-Zammad-Owner: [login of agent] X-Zammad-Owner: [login of agent]
-------------------------------- --------------------------------
Assigne ticket to agent. Assign ticket to agent.
X-Zammad-Ignore: [yes|true] X-Zammad-Ignore: [yes|true]
------------------------- -------------------------
@ -26,9 +26,9 @@ X-Zammad-Article-Type: (email|phone|fax|sms|webrequest|note|twitter status|direc
------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------
Article type (for whole list check your database). Article type (for whole list check your database).
X-Zammad-Article-Visability: (internal|external) X-Zammad-Article-Visibility: (internal|external)
------------------------------------------------ ------------------------------------------------
Article visability. Article visibility.
X-Zammad-Customer-Email: [email address] X-Zammad-Customer-Email: [email address]
---------------------------------------- ----------------------------------------