Browse Source

Merge branch '11.0' of https://github.com/muk-it/muk_web.git into 11.0

Conflicts:
	muk_web_client/static/description/index.html
8.0
Mathias Markl 7 years ago
parent
commit
2f95eed36a
  1. 18
      muk_web_client/static/description/index.html

18
muk_web_client/static/description/index.html

@ -7,7 +7,11 @@
</div> </div>
</section> </section>
<<<<<<< HEAD
<section class="oe_container" style="padding-bottom: 50px;"> <section class="oe_container" style="padding-bottom: 50px;">
=======
<section class="oe_container" style="padding-bottom: 60px;">
>>>>>>> branch '11.0' of https://github.com/muk-it/muk_web.git
<div class="oe_row oe_spaced"> <div class="oe_row oe_spaced">
<div class="oe_picture"> <div class="oe_picture">
<h3 class="oe_slogan">Overview</h3> <h3 class="oe_slogan">Overview</h3>
@ -16,8 +20,14 @@
notifications. To add a channel listener to the client just notifications. To add a channel listener to the client just
extend the web client and declare a new bus channel. extend the web client and declare a new bus channel.
</p> </p>
<<<<<<< HEAD
<pre> <pre>
<code> <code>
=======
<p>
<pre>
<code>
>>>>>>> branch '11.0' of https://github.com/muk-it/muk_web.git
var WebClient = require('web.WebClient'); var WebClient = require('web.WebClient');
var session = require('web.session'); var session = require('web.session');
@ -31,8 +41,14 @@ WebClient.include({
... ...
} }
}); });
<<<<<<< HEAD
</code> </code>
</pre> </pre>
=======
</code>
</pre>
</p>
>>>>>>> branch '11.0' of https://github.com/muk-it/muk_web.git
</div> </div>
</div> </div>
</section> </section>
@ -49,4 +65,4 @@ WebClient.include({
</div> </div>
<img src="logo.png" style="width: 200px; margin-bottom: 20px;" <img src="logo.png" style="width: 200px; margin-bottom: 20px;"
class="center-block"> class="center-block">
</section>
</section>
Loading…
Cancel
Save