Skip to content
Snippets Groups Projects
Commit e9ab5571 authored by Guillaume Carmel-Archambault's avatar Guillaume Carmel-Archambault
Browse files

Merge branch 'master' of git+ssh://sflphone_org@sflphone.org/git/sflphone 

Conflicts:

	src/Makefile.am
parents 8f3f26d4 aee25941
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 716 additions and 4974 deletions
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