Download as
Browse Code »

Commit f5e2cce75fface70d36ca6e468b223c93a9d4115

Authored by Leandro Santos
2 parents 7fd7443f 2e6aa13b
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

fix conflit with serpro-context

Showing 3 changed files with 5 additions and 1 deletions   Show diff stats
.gitmodules
  Diff comments   View file @f5e2cce
... ... @@ -28,3 +28,6 @@
28 28 [submodule "plugins/notification"]
29 29 path = plugins/notification
30 30 url = git@gitlab.com:noosfero-plugins/notification.git
  31 +[submodule "plugins/email_article"]
  32 + path = plugins/email_article
  33 + url = git@gitlab.com:noosfero-plugins/email_article.git
... ...
plugins/email_article 0 → 160000
  Diff comments   View file @f5e2cce
... ... @@ -0,0 +1 @@
  1 +Subproject commit cf863b86ed0df5a5e06c2f42984ec400fe5cb217
... ...
plugins/proposals_discussion
  Diff comments   View file @f5e2cce
1   -Subproject commit 2b9f87cf8bad86c1b8af22303da7025ec9fbe8b1
  1 +Subproject commit 32e6b1fef12caf0eb674f516a39ac88ea418bd82
... ...