Merge remote-tracking branch 'remotes/origin/APP_Refactored_mainJS' into develop
Conflicts: ClientServerLib/ClientServerLib/CServer.cs ServerLib/CWebservice.cs ServerLib/DataStructs.cs ServerLib/ICWebservice.cs Divided a mixed branch...
This commit is contained in:
commit
23a9059ff9
2 files changed
+1295
-1181
No files matched your search
@@ -78,7 +78,7 @@
|
||||
</div>
|
||||
<!-- /page -->
|
||||
|
||||
<div id="main" data-role="page" data-content-theme="a">
|
||||
<div id="main" data-role="page" data-content-theme="a" data-add-back-btn="false">
|
||||
<div data-role="header">
|
||||
<h1>Volcaluxe</h1>
|
||||
</div>
|
||||
|
||||
+1294
-1180
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user