|
Matt Friedman <maf675@gmail.com>
|
fd85ce57890948915c7ca0657a9952df95fd7e6a
fd85ce57890948915c7ca0657a9952df95fd7e6a |
Merge branch '3.2.x' |
|
|
Matt Friedman <maf675@gmail.com>
|
9ba12229cdf4c30802558186da3393c9ae099bae
m 9ba12229cdf4c30802558186da3393c9ae099bae |
Merge branch '3.1.x' into 3.2.x
# Conflicts:
# development/conf.py |
|
|
Crizzo
|
79d3ecf3cdc0695395af6243ac347b109763b6b6
m 79d3ecf3cdc0695395af6243ac347b109763b6b6 |
Merge pull request #97 from VSEphpbb/version-32x
Change version to 3.2.x |
|
|
Crizzo
|
66809624608103a769e0a0d9ea3d26f5c144d680
m 66809624608103a769e0a0d9ea3d26f5c144d680 |
Merge pull request #96 from VSEphpbb/version-31x
Change version to 3.1.x |
|
|
Matt Friedman <maf675@gmail.com>
|
cb9778476bd83d03c4ad0f5bf7e5a0d3ce612544
m cb9778476bd83d03c4ad0f5bf7e5a0d3ce612544 |
Change version to 3.2.x |
|