Download as
Browse Code »

Commit 1eab97b250b601ab9942bf6b2d8b14a6091c0253

Authored by Leandro Santos
2 parents 0be1e909 012b9e8f
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 4 additions and 2 deletions   Show diff stats
@@ -20,5 +20,7 @@ @@ -20,5 +20,7 @@
20 path = plugins/notification 20 path = plugins/notification
21 url = https://gitlab.com/noosfero-plugins/notification.git 21 url = https://gitlab.com/noosfero-plugins/notification.git
22 [submodule "plugins/email_article"] 22 [submodule "plugins/email_article"]
23 - path = plugins/email_article  
24 url = https://gitlab.com/noosfero-plugins/email_article.git 23 url = https://gitlab.com/noosfero-plugins/email_article.git
  24 +[submodule "public/designs/themes/participa-theme"]
  25 + path = public/designs/themes/participa-theme
  26 + url = https://gitlab.com/participa/participa-theme.git
gitignore.example
  Diff comments   View file @1eab97b
@@ -20,7 +20,6 @@ public/image_uploads @@ -20,7 +20,6 @@ public/image_uploads
20 public/thumbnails 20 public/thumbnails
21 public/user_themes 21 public/user_themes
22 public/designs/themes/default 22 public/designs/themes/default
23 -public/designs/themes/*  
24 public/designs/icons/default 23 public/designs/icons/default
25 24
26 public/assets 25 public/assets
public/designs/themes/participa-theme 0 → 160000
  Diff comments   View file @1eab97b
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +Subproject commit 39da58384fc3f011de026b593b7b8e849a840250