Merge branch 'ui_develop' into develop

Browse source

...

This commit is contained in:

cryptozoidberg 2020-12-03 18:14:58 +01:00

parent dc8d8f22b7 e02c269c17

commit 3d831930f6

No known key found for this signature in database

GPG key ID: 22DEB97A54C6FDEC

4 changed files with 5 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

4

src/gui/qt-daemon/html/main.js

View file

File diff suppressed because one or more lines are too long

2

src/gui/qt-daemon/html/main.js.map

View file

File diff suppressed because one or more lines are too long

2

src/gui/qt-daemon/html/styles.js

View file

File diff suppressed because one or more lines are too long

2

src/gui/qt-daemon/html/styles.js.map

View file

File diff suppressed because one or more lines are too long