From 59db0c72ece1e6ad24cd64616609faa0a3eb001b Mon Sep 17 00:00:00 2001
From: ulrich <not disclosed>
Date: Sat, 17 Dec 2016 10:08:45 +0000
Subject: [PATCH] Merge origin/master

---
 src/java/de/uhilger/um/api/UserMgr.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/java/de/uhilger/um/api/UserMgr.java b/src/java/de/uhilger/um/api/UserMgr.java
index 17a4210..3ae67bf 100644
--- a/src/java/de/uhilger/um/api/UserMgr.java
+++ b/src/java/de/uhilger/um/api/UserMgr.java
@@ -24,4 +24,8 @@
     return user;
   }
   
+  public String hallo() {
+    return "Hallo Welt";
+  }
+  
 }

--
Gitblit v1.9.3