Download as
Browse Code »

Commit f3421ecdf9ed87b5ad8540238fb83a04c4aa9092

Authored by Daniela Feitosa
2 parents 2454d82e 645a7610
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 branch 'stable'

Showing 3 changed files with 8 additions and 1 deletions   Show diff stats
@@ -17,6 +17,7 @@ Fernanda Lopes <nanda.listas+psl@gmail.com> @@ -17,6 +17,7 @@ Fernanda Lopes <nanda.listas+psl@gmail.com>
17 Grazieno Pellegrino <grazieno@gmail.com> 17 Grazieno Pellegrino <grazieno@gmail.com>
18 Italo Valcy <italo@dcc.ufba.br> 18 Italo Valcy <italo@dcc.ufba.br>
19 João da Silva <jaodsilv@linux.ime.usp.br> 19 João da Silva <jaodsilv@linux.ime.usp.br>
  20 +João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
20 Joenio Costa <joenio@colivre.coop.br> 21 Joenio Costa <joenio@colivre.coop.br>
21 Josef Spillner <josef.spillner@tu-dresden.de> 22 Josef Spillner <josef.spillner@tu-dresden.de>
22 Keilla Menezes <keilla@colivre.coop.br> 23 Keilla Menezes <keilla@colivre.coop.br>
debian/changelog
  Diff comments   View file @f3421ec
  1 +noosfero (0.34.2) unstable; urgency=low
  2 +
  3 + * Bugfixes version release
  4 +
  5 + -- Daniela Soares Feitosa <daniela@colivre.coop.br> Tue, 10 Jan 2012 20:48:42 -0200
  6 +
1 noosfero (0.34.1) unstable; urgency=low 7 noosfero (0.34.1) unstable; urgency=low
2 8
3 * Bugfixes version release 9 * Bugfixes version release
lib/noosfero.rb
  Diff comments   View file @f3421ec
1 module Noosfero 1 module Noosfero
2 PROJECT = 'noosfero' 2 PROJECT = 'noosfero'
3 - VERSION = '0.34.1' 3 + VERSION = '0.34.2'
4 4
5 def self.pattern_for_controllers_in_directory(dir) 5 def self.pattern_for_controllers_in_directory(dir)
6 disjunction = controllers_in_directory(dir).join('|') 6 disjunction = controllers_in_directory(dir).join('|')