Sylvain Berfini 82d804587a Merge branch 'master' into dev_in_app_purchase ... Conflicts: bsed.sh		2015-07-06 15:54:57 +02:00
..
account_preferences.xml	Added text to explain to user he'll have to retype password if he edits username and/or domain & revert previous commit	2014-07-21 17:33:52 +02:00
authenticator.xml	Use string from custom as authenticator type to prevent mismatch	2015-05-04 14:49:14 +02:00
contacts.xml	Re-add sip contact address	2015-03-25 17:14:27 +01:00
preferences.xml	Merge branch 'master' into dev_in_app_purchase	2015-07-06 15:54:57 +02:00
syncadapter.xml	Re-add sip contact address	2015-03-25 17:14:27 +01:00