Remove spurious tabs from indications.conf
FREEPBX-7180 #QA #comment hides change sip driver on inital creation of extension/device
Double Message
Merge branch 'release/12.0' into develop

* release/12.0:
  Remove Duplicate Supported Tags. Opps
  Fixed Supported for Core
Merge branch 'release/12.0' into develop

* release/12.0:
  Add presence state to connectedline name, if available.
  Add display of presence state in connectedline name.
Merge branch 'release/12.0' into develop

* release/12.0:
  Remove Duplicate Supported Tag
  Reapply 0dbc53374079b58d26e5d533c5afa1038e20766e
  Fixed Supported for Core
  Fix Presense State Bug matching 's' from 's-'.
  FREEPBX-7202 - Ensure MOH is always set, even to default.
  Bump version
  FREEPBX-7202 - Ensure MOH is always set, even to default.
  Add vim header
  Actually bump version
  Bump version for release.
  Add presence state to connectedline name, if available.
  Add display of presence state in connectedline name.
FREEPBX-7174 #QA #comment Fixed
Merge branch 'release/12.0' into develop
Merge branch 'release/12.0' into develop
Merge branch 'release/12.0' into develop

* release/12.0:
  Version Bump
Merge branch 'release/12.0' into develop

* release/12.0:
  Tidy up ancient checks in macro-user-callerid, add minor D&U fix

Conflicts:
	functions.inc.php
Merge branch 'release/12.0' into develop

* release/12.0:
  Ampersands!!!
  Version bump