Download as
Browse Code »

Commit 048297068a343aed4967b13a29335f0736a3edbd

Authored by Leandro Santos
2 parents c89d93a4 7cb415ed
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'production' of gitlab.com:participa/noosfero into production

Showing 3 changed files with 5 additions and 1 deletions   Show diff stats
.gitmodules
  Diff comments   View file @0482970
... ... @@ -37,3 +37,6 @@
37 37 [submodule "plugins/dialoga"]
38 38 path = plugins/dialoga
39 39 url = https://gitlab.com/participa/dialoga-plugin.git
  40 +[submodule "public/designs/themes/dialoga"]
  41 + path = public/designs/themes/dialoga
  42 + url = https://gitlab.com/participa/dialoga.git
... ...
public/designs/themes/dialoga 0 → 160000
  Diff comments   View file @0482970
... ... @@ -0,0 +1 @@
  1 +Subproject commit 90a85863c204d297e31ab86818626c86c01d8883
... ...
public/proposal-app
  Diff comments   View file @0482970
1   -Subproject commit fd05f50e6c3d5ce381bcfc441f689840721a5df2
  1 +Subproject commit 2ad145f9b6c1a298c5a7b35661ba28bdf2071c36
... ...