FREEPBX-7117 - fixing implementation per discussion with the rest of the dev team
bumping version
Merge branch 'release/2.10' into release/2.11
bumping version
FREEPBX-7117 - 2.9 has no concept of $no_auth, moving to FREEPBX_IS_AUTH everywhere
updating module.xml for version bump relating to FREEPBX-7117
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  updating module.xml for version bump relating to FREEPBX-7117
  FREEPBX-7117 - 2.9 has no concept of $no_auth, moving to FREEPBX_IS_AUTH everywhere
  bumping version
  bumping version
  FREEPBX-7117 - fixing implementation per discussion with the rest of the dev team

Conflicts:
	amp_conf/htdocs/admin/libraries/view.functions.php
Version Bump
Merge branch 'release/12.0' into develop

* release/12.0:
  Version Bump
  updating module.xml for version bump relating to FREEPBX-7117
  FREEPBX-7117 - 2.9 has no concept of $no_auth, moving to FREEPBX_IS_AUTH everywhere
  bumping version
  bumping version
  FREEPBX-7117 - fixing implementation per discussion with the rest of the dev team