Gautier Pelloux-Prayer 3b8ddd28a1 Merge branch 'dev_inapp_purchase' ... Conflicts: .tx/config Classes/Base.lproj/WizardViews.xib Classes/Utils/Utils.h Classes/Utils/Utils.m Classes/WizardViewController.h Classes/WizardViewController.m Resources/linphonerc-factory Resources/linphonerc-factory~ipad		2015-04-30 17:01:51 +02:00
..
InAppSettings.bundle	Merge branch 'dev_inapp_purchase'	2015-04-30 17:01:51 +02:00