Merge branch 'og-logged-in-user-fix'

Conflicts: Netdisco/lib/App/Netdisco.pm
2014-05-27 10:47:40 +01:00
parent d27ceed33e 39d1ee9a31
commit 97f68aaeb6
4 changed files with 27 additions and 6 deletions
--- a/Netdisco/META.yml
+++ b/Netdisco/META.yml
@@ -80,4 +80,4 @@ resources:
  homepage: http://netdisco.org/
  license: http://opensource.org/licenses/bsd-license.php
  repository: git://git.code.sf.net/p/netdisco/netdisco-ng
-version: 2.027006
+version: 2.027007