Skip to content
Snippets Groups Projects
Commit 7b294dfa authored by Adrien Béraud's avatar Adrien Béraud
Browse files

Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/savoirfairelinux/sflphone/client/SFLphoneApplication.java
parents c99b843b 371b77e6
No related branches found
No related tags found
No related merge requests found
Showing
with 784 additions and 756 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