Johannes Meyer 1d6ad6df21 Merge branch 'master' into feature/custom-menu-items-5600 ...

Conflicts:
	modules/monitoring/configuration.php

2015-09-15 13:31:30 +02:00

..

Color.php

Add docstrings to ObjectList and coding style

2015-04-07 16:34:20 +02:00

ConfigAwareFactory.php

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

Dimension.php

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

EnumeratingFilterIterator.php

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

File.php

Add a new ssh resource form

2015-05-28 10:44:58 +02:00

Format.php

lib: Fix sprintf format strings used in Format::seconds()

2015-05-22 16:06:11 +02:00

String.php

Navigation: Add method createItem()

2015-09-01 16:02:44 +02:00

TimezoneDetect.php

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

Translator.php

Normalize languages for negotiation to lowercase

2015-08-31 16:45:14 +02:00