ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-01-03 10:25:08 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into AD-51-easy-to-view-manage-1-editions-coi

Browse Source 
Conflicts:
	piece/models.py
	web/urls/frontend.py
This commit is contained in:
ddejongh 2015-05-29 15:27:40 +02:00
parent 961b8ee58d
commit c6e97d916d
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/ascribe_forms/input_text.js
View File

@ -8,7 +8,7 @@ let InputText = React.createClass({
getInitialState() { getInitialState() {
return {value: null, return {value: null,
alerts: null alerts: null // needed in AlertMixin
}; };
}, },
handleChange(event) { handleChange(event) {

1
js/components/ascribe_forms/input_textarea.js
View File

@ -27,7 +27,6 @@ let InputTextArea = React.createClass({
onChange={this.handleChange}></textarea> onChange={this.handleChange}></textarea>
</div> </div>
); );
} }
}); });