Commit f3421ecdf9ed87b5ad8540238fb83a04c4aa9092

Authored by Daniela Feitosa
2 parents 2454d82e 645a7610

Merge branch 'stable'

Showing 3 changed files with 8 additions and 1 deletions   Show diff stats
AUTHORS
... ... @@ -17,6 +17,7 @@ Fernanda Lopes <nanda.listas+psl@gmail.com>
17 17 Grazieno Pellegrino <grazieno@gmail.com>
18 18 Italo Valcy <italo@dcc.ufba.br>
19 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 21 Joenio Costa <joenio@colivre.coop.br>
21 22 Josef Spillner <josef.spillner@tu-dresden.de>
22 23 Keilla Menezes <keilla@colivre.coop.br>
... ...
debian/changelog
  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 7 noosfero (0.34.1) unstable; urgency=low
2 8  
3 9 * Bugfixes version release
... ...
lib/noosfero.rb
1 1 module Noosfero
2 2 PROJECT = 'noosfero'
3   - VERSION = '0.34.1'
  3 + VERSION = '0.34.2'
4 4  
5 5 def self.pattern_for_controllers_in_directory(dir)
6 6 disjunction = controllers_in_directory(dir).join('|')
... ...