Download as
Browse Code »

Commit 0d3ff63107fbb5030b8ea2a4546a3efa462a3636

Authored by Victor Costa
2 parents ff6d7e55 836d5493
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 'stable' of gitlab.com:participa/noosfero into stable

Showing 6 changed files with 5 additions and 4 deletions   Show diff stats
.gitmodules
  Diff comments   View file @0d3ff63
... ... @@ -25,3 +25,6 @@
25 25 [submodule "public/designs/themes/participa-theme"]
26 26 path = public/designs/themes/participa-theme
27 27 url = https://gitlab.com/participa/participa-theme.git
  28 +[submodule "public/proposal-app"]
  29 + path = public/proposal-app
  30 + url = https://gitlab.com/participa/proposal-app.git
... ...
public/designs/themes/consulta
View file @ff6d7e5
... ... @@ -1 +0,0 @@
1   -Subproject commit 7849af67b35e6560fe5906738f2b30dd88bec392
public/designs/themes/gradebasica
View file @ff6d7e5
... ... @@ -1 +0,0 @@
1   -Subproject commit 41196988b02ec46963dfd7cc6d7e6e93912ef7ad
public/designs/themes/participa-theme
  Diff comments   View file @0d3ff63
1   -Subproject commit 39da58384fc3f011de026b593b7b8e849a840250
  1 +Subproject commit 4716af097fe208efdf75a72997328ed23c00f4f6
... ...
public/designs/themes/serpro
View file @ff6d7e5
... ... @@ -1 +0,0 @@
1   -Subproject commit 225c72fdc236379159a997b17b7203a582343292
public/proposal-app 0 → 160000
  Diff comments   View file @0d3ff63
... ... @@ -0,0 +1 @@
  1 +Subproject commit f8ed9617604a3fe45e0196c7beda086e25d340ea
... ...