1
0
mirror of https://github.com/ascribe/onion.git synced 2024-11-15 01:25:17 +01:00

Merge remote-tracking branch 'remotes/origin/AD-858-contract-history' into AD-883-show-notificationsrequests-on-col

Conflicts:
	ownership/serializers.py
This commit is contained in:
diminator 2015-09-04 16:48:00 +02:00
parent 4bdab3410e
commit 1611a75036

View File

@ -39,7 +39,7 @@ let IkonotvContractNotifications = React.createClass({
<img src={this.state.whitelabel.logo} />
</div>
<div>
<embed src="http://www.orimi.com/pdf-test.pdf"
<embed src={this.state.contractAgreementListNotifications[0].contract_agreement.contract.blob}
width="600" height="500" alt="pdf"
pluginspage="http://www.adobe.com/products/acrobat/readstep2.html" />
</div>