Merge branch 'wip'

munkireport · Apr 25, 2015 · 443c10f · 443c10f
2 parents dce24e7 + b78e86c
commit 443c10f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,18 +1,19 @@
-### 2.4.1 (April 13, 2015)
+### 2.4.2 (April 25, 2015)
 
 FIXES
 
 * Disable power reporting for desktops
 * Fix labels for donut chart in network locations
 * Fix machine migration script
 * Fix warranty lookups
+* Improved installer package
 
 NEW FEATURES
 
 * Select modules in installer
 * Profile reporting (thanks to @dingerkingh)
 * Russian localisation (thanks to @little2112)
-
+* improved power widget labels (thanks to @rickheil)
 
 ### 2.3.0 (March 11, 2015)
 

diff --git a/app/helpers/site_helper.php b/app/helpers/site_helper.php
@@ -1,7 +1,7 @@
 <?php
 
 // Munkireport version (last number is number of commits)
-$GLOBALS['version'] = '2.4.2.1067';
+$GLOBALS['version'] = '2.4.2.1076';
 
 // Return version without commit count
 function get_version()