Merge branch 'dev' into issue_1240_tos_update
Conflicts: resources/static/dialog/js/misc/state.js
No related branches found
No related tags found
Showing
- README.md 0 additions, 1 deletionREADME.md
- lib/static_resources.js 99 additions, 99 deletionslib/static_resources.js
- resources/static/common/css/ie8.css 1 addition, 1 deletionresources/static/common/css/ie8.css
- resources/static/common/css/style.css 20 additions, 20 deletionsresources/static/common/css/style.css
- resources/static/common/fonts/LICENSE.txt 0 additions, 0 deletionsresources/static/common/fonts/LICENSE.txt
- resources/static/common/fonts/OpenSans-Bold.eot 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-Bold.eot
- resources/static/common/fonts/OpenSans-Bold.ttf 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-Bold.ttf
- resources/static/common/fonts/OpenSans-Bold.woff 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-Bold.woff
- resources/static/common/fonts/OpenSans-BoldItalic.eot 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-BoldItalic.eot
- resources/static/common/fonts/OpenSans-BoldItalic.ttf 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-BoldItalic.ttf
- resources/static/common/fonts/OpenSans-BoldItalic.woff 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-BoldItalic.woff
- resources/static/common/fonts/OpenSans-Italic.eot 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-Italic.eot
- resources/static/common/fonts/OpenSans-Italic.ttf 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-Italic.ttf
- resources/static/common/fonts/OpenSans-Italic.woff 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-Italic.woff
- resources/static/common/fonts/OpenSans-Light.eot 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-Light.eot
- resources/static/common/fonts/OpenSans-Light.ttf 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-Light.ttf
- resources/static/common/fonts/OpenSans-Light.woff 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-Light.woff
- resources/static/common/fonts/OpenSans-LightItalic.eot 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-LightItalic.eot
- resources/static/common/fonts/OpenSans-LightItalic.ttf 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-LightItalic.ttf
- resources/static/common/fonts/OpenSans-LightItalic.woff 0 additions, 0 deletionsresources/static/common/fonts/OpenSans-LightItalic.woff
Loading
Please register or sign in to comment