Download as
Browse Code »

Commit 66d63ed2e7b1706a60bd01208fd273295b8a6e14

Authored by Leandro Santos
2 parents aa865e90 a6c2ec9e
Exists in staging and in 7 other branches angular_poc, api-article-archived, api-homepage, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email

fix conflit with serpro context

Showing 3 changed files with 5 additions and 5 deletions   Show diff stats
.gitmodules
  Diff comments   View file @66d63ed
... ... @@ -28,9 +28,9 @@
28 28 [submodule "public/proposal-app"]
29 29 path = public/proposal-app
30 30 url = https://gitlab.com/participa/proposal-app.git
31   -[submodule "plugins/juventude"]
32   - path = plugins/juventude
33   - url = https://gitlab.com/noosfero-plugins/juventude.git
34 31 [submodule "plugins/gravatar-provider"]
35 32 path = plugins/gravatar-provider
36 33 url = https://gitlab.com/noosfero-plugins/gravatar-provider.git
  34 +[submodule "plugins/juventude"]
  35 + path = plugins/juventude
  36 + url = https://gitlab.com/noosfero-plugins/juventude.git
... ...
plugins/gamification
  Diff comments   View file @66d63ed
1   -Subproject commit 1f2171520eb4719fefc5a32f26ef2a002cd61f0d
  1 +Subproject commit 350c561d8ca9e138076a160ddfe733c26ed04bf8
... ...
plugins/pairwise
  Diff comments   View file @66d63ed
1   -Subproject commit 3c5c557e0839cfd18720e8dbd3cd2e76f8f209f8
  1 +Subproject commit ce9f73e7b733180d4765e29a27c951bdb58ff43d
... ...