Download as
Browse Code »

Commit 5d1d95065c66f1a3bc02ec4e8357ba9d966d3c6d

Authored by Leonardo Merlin
2 parents 731f0401 8c107e10
Exists in master and in 6 other branches feature-captcha, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'master' into staging

Showing 2 changed files with 2 additions and 4 deletions   Show diff stats
src/app/pages/article/article.html
  Diff comments   View file @5d1d950
... ... @@ -32,9 +32,7 @@
32 32 </div>
33 33 </header>
34 34 <article>
35   - <div class="container">
36   - <div ng-bind-html="pageArticle.article.body"></div>
37   - </div>
  35 + <div ng-bind-html="pageArticle.article.body"></div>
38 36 </article>
39 37 </article>
40 38 </div>
... ...
src/app/pages/propostas/propostas.controller.js
  Diff comments   View file @5d1d950
... ... @@ -143,7 +143,7 @@
143 143 };
144 144  
145 145 if (vm.selectedTheme) {
146   - params.categories_ids = vm.selectedTheme.id;
  146 + params.category_ids = vm.selectedTheme.id;
147 147 }
148 148  
149 149 if (query) {params.query = query; }
... ...