mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-12 23:14:18 +01:00
Merge remote-tracking branch 'origin/support/3.2' into develop
# Conflicts: # .doc/README.md # .doc/phpdoc-templates/combodo-wiki/graphs/class.html.twig # composer.lock # lib/composer/InstalledVersions.php # lib/composer/autoload_classmap.php # lib/composer/autoload_psr4.php # lib/composer/autoload_static.php # lib/composer/installed.json # lib/composer/installed.php # lib/symfony/cache/Traits/Relay/MoveTrait.php # lib/symfony/http-foundation/Request.php # lib/symfony/runtime/SymfonyRuntime.php
This commit is contained in:
@@ -122,6 +122,9 @@ $(function()
|
||||
_create: function () {
|
||||
this.element.addClass('ibo-activity-panel');
|
||||
|
||||
// Should be initialized globally, but as we don't actually do it
|
||||
moment.locale(GetUserLanguage());
|
||||
|
||||
this._bindEvents();
|
||||
|
||||
// Lock
|
||||
|
||||
Reference in New Issue
Block a user