Fix conflict and update strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
This commit is contained in:
commit
2c1618bc10
70 changed files with 3229 additions and 1095 deletions
|
@ -23,6 +23,7 @@ import ObjectUtils from '../../../ObjectUtils';
|
|||
import AppsDrawer from './AppsDrawer';
|
||||
import { _t } from '../../../languageHandler';
|
||||
|
||||
|
||||
module.exports = React.createClass({
|
||||
displayName: 'AuxPanel',
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue