Skip to content
Snippets Groups Projects
Commit 739743f0 authored by Felix Sidokhine's avatar Felix Sidokhine
Browse files

Merge branch 'master' of gitlab.savoirfairelinux.com:fsidokhine/jams-refactoring

# Conflicts:
#	jams-server/src/main/java/net/jami/jams/server/servlets/LoginServlet.java
parents 9fcb2274 94b13f27
No related branches found
No related tags found
No related merge requests found
Showing
with 197 additions and 76 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment