Alexey Melnichuk a4b0b2d271 Merge branch 'master' into number_alias_as_vm_id ... Conflicts: app/hot_desking/extension_edit.php		2015-07-21 11:19:13 +04:00
..
resources/scripts	Merge branch 'master' into number_alias_as_vm_id	2015-07-21 11:19:13 +04:00
index.lua	Add the missing include for the languages section.	2015-03-09 23:49:15 +00:00