diminator b45c68b2dc Merge remote-tracking branch 'remotes/origin/AD-885-convert-roles-to-acls' into AD-924-apply-contractagreements-to-loan- ... Conflicts: ownership/serializers.py		2015-09-10 18:54:25 +02:00
..
prize	Merge remote-tracking branch 'remotes/origin/master' into AD-456-ikonotv-branded-page-for-registra	2015-09-10 17:45:51 +02:00
wallet	Merge remote-tracking branch 'remotes/origin/AD-885-convert-roles-to-acls' into AD-924-apply-contractagreements-to-loan-	2015-09-10 18:54:25 +02:00