Skip to content
Snippets Groups Projects
Commit eb598762 authored by Erik Alexandre Pucci's avatar Erik Alexandre Pucci
Browse files

Merge remote branch 'stable/master'


Conflicts:
	client/conf/version

Signed-off-by: default avatarErik Alexandre Pucci <eap08@c3sl.ufpr.br>
parents a29bf875 b6a0cad3
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment