Download as
Browse Code »

Commit 4250b4479f695e7eb2de1f77bcabfed6bd367507

Authored by Daniela Feitosa
2 parents c4affd13 ea3a106e
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge commit 'refs/merge-requests/8' of git://gitorious.org/noosfero/noosfero into merge-requests/8

Showing 1 changed file with 2 additions and 0 deletions   Show diff stats
gitignore.example
  Diff comments   View file @4250b44
@@ -8,6 +8,7 @@ config/session.secret @@ -8,6 +8,7 @@ config/session.secret
8 config/noosfero.yml 8 config/noosfero.yml
9 config/ferret_server.yml 9 config/ferret_server.yml
10 config/mongrel_cluster.yml 10 config/mongrel_cluster.yml
  11 +config/plugins
11 index 12 index
12 locale 13 locale
13 log 14 log
@@ -19,6 +20,7 @@ public/designs/themes/default @@ -19,6 +20,7 @@ public/designs/themes/default
19 public/designs/icons/default 20 public/designs/icons/default
20 public/javascripts/cache*.js 21 public/javascripts/cache*.js
21 public/stylesheets/cache*.css 22 public/stylesheets/cache*.css
  23 +public/plugins
22 db/development.db 24 db/development.db
23 db/production.db 25 db/production.db
24 db/test.db 26 db/test.db