Merge with germany
- Aug 18, 2016
-
-
Egon Nathan Bittencourt Araujo authored
Conflicts: daemon/src/main/java/org/openslx/taskmanager/App.java
d61df947
-
- Sep 29, 2015
-
-
Simon Rettberg authored7cb0f7c2
-
- Sep 28, 2015
-
-
Simon Rettberg authored4c974ca2
-
- Feb 24, 2015
-
-
Simon Rettberg authored9820962a
-
- Jan 27, 2015
-
-
Simon Rettberg authoredfd3c703e
-