Skip to content
Snippets Groups Projects
Commit 45dc1476 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

Merge branch 'gtk3_migration' of... 

Merge branch 'gtk3_migration' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into gtk3_migration

Resolved Conflicts:
	gnome/src/config/accountconfigdialog.c
parents b253473c a29f7f32
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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