Merge branch 'master' into DepauMD

This commit is contained in:
Davide Depau 2018-10-03 03:00:10 +02:00
commit ced1193401
2 changed files with 2 additions and 2 deletions

View file

@ -195,7 +195,7 @@ When youre a carpenter making a beautiful chest of drawers, youre not goin
## Externals
### YouTube
{%youtube 1G4isv_Fylg %}
{%youtube aqz-KE-bpKQ %}
### Vimeo
{%vimeo 124148255 %}

View file

@ -150,7 +150,7 @@
<option value="id">Bahasa Indonesia</option>
</select>
<p>
&copy; 2018 <a href="https://hackmd.io">CodiMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a><% if(privacyStatement) { %> | <a href="<%- url %>/s/privacy" target="_blank"><%= __('Privacy') %></a><% } %><% if(termsOfUse) { %> | <a href="<%- url %>/s/terms-of-use" target="_blank"><%= __('Terms of Use') %></a><% } %>
Powered by <a href="https://codimd.org">CodiMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a><% if(privacyStatement) { %> | <a href="<%- url %>/s/privacy" target="_blank"><%= __('Privacy') %></a><% } %><% if(termsOfUse) { %> | <a href="<%- url %>/s/terms-of-use" target="_blank"><%= __('Terms of Use') %></a><% } %>
</p>
<h6 class="social-foot">
<%- __('Follow us on %s and %s.', '<a href="https://github.com/hackmdio/CodiMD" target="_blank"><i class="fa fa-github"></i> GitHub</a>, <a href="https://riot.im/app/#/room/#codimd:matrix.org" target="_blank"><i class="fa fa-comments"></i> Riot</a>', '<a href="https://translate.codimd.org" target="_blank"><i class="fa fa-globe"></i> POEditor</a>') %>