Skip to content
Snippets Groups Projects
Commit b205434c authored by areversat's avatar areversat
Browse files

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

Conflicts:

	sflphone-gtk/src/Makefile.am
parents bc9bc5c9 78b1ed01
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 131 additions and 21 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