src/account.h · fb0814759acc3cd0739d12731b51db81cf8f1992 · savoirfairelinux / jami-daemon · GitLab

Find file Blame History Permalink

Merge commit 'origin/master' into dbus · fb081475
Pierre-Luc Beaudoin authored Sep 07, 2007
```
Conflicts:

	.gitignore
	src/Makefile.am
	src/managerimpl.cpp
```
fb081475