Skip to content
Commit 19534e7a authored by Oskár Adam Válent's avatar Oskár Adam Válent 👀
Browse files

Merge remote-tracking branch 'origin/oauth' into oauth 

# Conflicts:
#	module-user/src/main/java/cz/muni/fi/pa165/moduleuser/CustomConfiguration.java
parents d89c422c 4d9a1d2f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment