Skip to content
Snippets Groups Projects
Commit 75200cd8 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'history_addons' into search_bar 

Conflicts:

	sflphone-gtk/src/Makefile.am
	sflphone-gtk/src/timestamp.c
parents 6ac46ac5 a3e038ee
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 355 additions and 114 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