Merge branch 'ze-updates' into 'master'

Changed URL to Gitlab URL for ideas to direct properly

See merge request monero-project/forum-funding-system!7

forum-funding-system/ideas/index.html

@@ -24,7 +24,7 @@ title: Ideas
                 {% if toplevel.stage == "Ideas" %}
                     {% for proposal in toplevel.proposals%}
                         <div class="col-xs-12">
-                            <a href="{{proposal.url}}" class="row middle-xs ffs-idea">
+                            <a href="{{proposal.gitlab-url}}" class="row middle-xs ffs-idea">
                                 <div class="col-xs-12">
                                     <h3>{{proposal.name}}</h3>
                                     <div class="row">
@@ -41,4 +41,4 @@ title: Ideas
 </section>
 
 
-                                        
\ No newline at end of file
+