FREEPBX-7244 #QA #comment The Asterisk Manager connection needs to be made regardless
Merge branch 'master' of ssh://git.freepbx.org/freepbx/directory

# By Andrew (1) and Kevin McCoy (1)
# Via Andrew Nagy (1) and Rob Thomas (1)
* 'master' of ssh://git.freepbx.org/freepbx/directory:
  Updated ru_RU
  Updated ja_JP
Update for license file
[Module Tag script: directory 2.11.0.5]
FREEPBX-5332 remove togglevalue
version bump
LL
[Module Tag script: directory 12.0.0]
cleanup xss
FREEPBX-7753 - support french accents in the directory thanks to philippebolduc
Merge branch 'master' into release/2.11
Merge branch 'release/2.11' into develop

Conflicts:
	module.xml
Merge branch 'develop' into release/12.0
Merge branch 'FREEPBX-7753' of ssh://git.freepbx.org/freepbx/directory into release/12.0

Conflicts:
	agi-bin/directory.lib.php
vb
[Module Tag script: directory 12.0.1]