Download as
Browse Code »

Commit 3981f008c2fc302c0307a69b77d79d7204422516

Authored by Victor Costa
2 parents 8cf8c5e2 8920c3d4
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 'serpro-context' into stable

Showing 2 changed files with 4 additions and 0 deletions   Show diff stats
.gitmodules
  Diff comments   View file @3981f00
... ... @@ -13,3 +13,6 @@
13 13 [submodule "plugins/pairwise"]
14 14 path = plugins/pairwise
15 15 url = git@gitlab.com:noosfero-plugins/pairwise.git
  16 +[submodule "plugins/proposals_discussion"]
  17 + path = plugins/proposals_discussion
  18 + url = git@gitlab.com:noosfero-plugins/proposals_discussion.git
... ...
plugins/proposals_discussion 0 → 160000
  Diff comments   View file @3981f00
... ... @@ -0,0 +1 @@
  1 +Subproject commit ab056240fa5a8e67a58e22ccdb7d7fda206e5f59
... ...