Commit 5bbb7305736c2897f5196d332bf6a4c541cc6f1e

Authored by Antonio Terceiro
2 parents 34593e71 17aa8b4c

Merge branch 'stable'

Showing 2 changed files with 4 additions and 1 deletions   Show diff stats
@@ -9,13 +9,16 @@ Developers @@ -9,13 +9,16 @@ Developers
9 Antonio Terceiro <terceiro@colivre.coop.br> 9 Antonio Terceiro <terceiro@colivre.coop.br>
10 Aurelio A. Heckert <aurelio@colivre.coop.br> 10 Aurelio A. Heckert <aurelio@colivre.coop.br>
11 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> 11 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
  12 +Fernanda Lopes <nanda.listas+psl@gmail.com>
12 Grazieno Pellegrino <grazieno@gmail.com> 13 Grazieno Pellegrino <grazieno@gmail.com>
  14 +Italo Valcy <italo@dcc.ufba.br>
13 Joenio Costa <joenio@colivre.coop.br> 15 Joenio Costa <joenio@colivre.coop.br>
14 Josef Spillner <josef.spillner@tu-dresden.de> 16 Josef Spillner <josef.spillner@tu-dresden.de>
15 Leandro Nunes dos Santos <leandronunes@gmail.com> 17 Leandro Nunes dos Santos <leandronunes@gmail.com>
16 Martín Olivera <molivera@solar.org.ar> 18 Martín Olivera <molivera@solar.org.ar>
17 Moises Machado <moises@colivre.coop.br> 19 Moises Machado <moises@colivre.coop.br>
18 Raphaël Rousseau <raph@r4f.org> 20 Raphaël Rousseau <raph@r4f.org>
  21 +Raquel Lira <raquel.lira@gmail.com>
19 Rodrigo Souto <rodrigo@colivre.coop.br> 22 Rodrigo Souto <rodrigo@colivre.coop.br>
20 Ronny Kursawe <kursawe.ronny@googlemail.com> 23 Ronny Kursawe <kursawe.ronny@googlemail.com>
21 Valessio Brito <valessio@gmail.com> 24 Valessio Brito <valessio@gmail.com>
lib/noosfero.rb
1 module Noosfero 1 module Noosfero
2 PROJECT = 'noosfero' 2 PROJECT = 'noosfero'
3 - VERSION = '0.23.2' 3 + VERSION = '0.23.3'
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('|')