Jordi Boggiano
eedbd218f5
Make sure circular dependencies do not break the autoload dumper, refs #7316 , refs #7348
6 years ago
Jordi Boggiano
46f973e213
Merge branch '1.6'
6 years ago
Philipp Fritsche
b0be87177d
Filter dev-dependencies from "dump-autoload --no-dev" , fixes #4343
6 years ago
Jordi Boggiano
4ebb747e12
Merge branch '1.6'
6 years ago
Jordi Boggiano
78ae0a97f7
Terminate quoted strings
6 years ago
Jordi Boggiano
3b9d6769bf
Fix class names in comments being parsed in short_open_tags files, fixes #7289
6 years ago
Jordi Boggiano
464daeebe2
Merge branch '1.6'
6 years ago
Jordi Boggiano
43e33be79f
Fix regression in 036fc44c25
, fixes #7268
6 years ago
Jordi Boggiano
38866ba310
Merge remote-tracking branch 'johnstevenson/external-xdebug'
7 years ago
Jordi Boggiano
c917865fe9
Fix handling of dev versions and consolidate logic, refs #7119
7 years ago
Jordi Boggiano
24ad6307a7
Merge remote-tracking branch 'austris-argalis/issue-7085'
7 years ago
Jordi Boggiano
ea78712822
Merge branch '1.6'
7 years ago
Edwin Rodríguez
9dc6222288
Allow using fossil dependency in a fossil repository, fixes #7125 , closes #7126
7 years ago
Jordi Boggiano
35ebb8b93f
Merge branch '1.6'
7 years ago
Filippo Tessarotto
277f32d388
Lock _readme: remove outdated hashtag link part, closes #7096
7 years ago
Jordi Boggiano
2bd34c0534
Merge branch '1.6'
7 years ago
Jordi Boggiano
9041622b86
Fix version guessing regression and a few other issues, fixes #7127
7 years ago
Jordi Boggiano
bfa01285c2
Merge branch '1.6'
7 years ago
Jordi Boggiano
066351c5b9
Remove use of deprecated getMock method
7 years ago
Jordi Boggiano
036fc44c25
Make sure aliased packages are removed correctly from the repository, fixes #7167
7 years ago
Petr /Peggy/ Sládek
8d06832077
Update ClassMapGenerator to work better with symlinks, fixes #7252 , closes #7251
7 years ago
johnstevenson
ed97c2116c
Use external XdebugHandler library
7 years ago
austris argalis
8a5645ffda
Wording: Downgrading instead of Updating #7085
7 years ago
Jordi Boggiano
16dcb04e1d
Merge branch '1.6'
7 years ago
Jordi Boggiano
a1bf6890d5
Fix ConsoleIO tests
7 years ago
Jordi Boggiano
96d07e6753
Merge branch '1.6'
7 years ago
Jordi Boggiano
842a7ea922
Fix dev-master not being normalized correctly for the root package, fixes #7007
7 years ago
Jordi Boggiano
ad8b44a4c8
Merge branch '1.6'
7 years ago
Jordi Boggiano
ea9b7ecbb0
Merge pull request #6982 from carusogabriel/phpstan
...
Fixes from PHPStan level 0
7 years ago
Jean-Baptiste
595cf4432c
Fix Test RepositoryFactory
7 years ago
Martin Hujer
bbee0d7c6c
Validation warns if script description for nonexistent script is present
...
Fixes #7010
7 years ago
Gabriel Caruso
3d262bd637
Fixes from PHPStan level 0
...
More fixes from PHPStan level 0
7 years ago
Tomas Klinkenberg
60106edd32
Added a test to confirm issue #6994 .
...
Added a encapsulated group to the replacement parameter of the `preg_replace` for GitLab in `\Composer\Util\Url::updateDistReference()`. This fixes #6994 .
7 years ago
Jordi Boggiano
e6114b2ca7
Fix support for replacing dist refs in gitlab URLs and add support for gitlab/github enterprise too
7 years ago
Gabriel Caruso
2ad6f611d7
Allow bin key to receive string
7 years ago
Andreas Möller
79828f7543
Enhancement: Assert that key is removed when value is null
7 years ago
Jordi Boggiano
50665aa18d
Simplify check for current revision, refs #6684
7 years ago
Jordi Boggiano
93cd9d874b
Merge remote-tracking branch 'RobberPhex/git-repo'
7 years ago
John Stevenson
02fbbd5a42
Skip MockedZipDownloader tests if zip is missing ( #6917 )
...
* Skip MockedZipDownloader tests if zip is missing
7 years ago
Jordi Boggiano
a1c5754b1f
Make sure tests run non-interactively
7 years ago
Jordi Boggiano
c8aea719b1
CS fixes
7 years ago
Jordi Boggiano
0a9abeef88
Merge branch '1.5'
7 years ago
Renoir Boulanger
9f723ba381
Support GitLab repositories w/ port over HTTPs
...
When we have self-hosted GitLab, over HTTPs, on a different port.
rel composer/composer#6894
7 years ago
Alessandro Lai
54adf0b61e
Add regression test about VersionGuesser pretty_version handling
7 years ago
Gabriel Caruso
885da4c8ef
Refactoring tests
7 years ago
Gabriel Caruso
afc9a7643e
Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase
7 years ago
Gabriel Caruso
a4b220273e
Refactoring Tests ( #6849 )
7 years ago
Jordi Boggiano
6256e17149
Merge branch '1.5'
7 years ago
Jordi Boggiano
5ba6d7d436
Fix pretty guessed versions to show nicely on numeric branches, refs #6845
7 years ago
Alessandro Lai
3cf31da414
Fix root package not having a pretty version when detecting from VCS, fixes #6845 , closes #6847
7 years ago
Jordi Boggiano
eab826b00b
Merge branch '1.5'
7 years ago
Jordi Boggiano
45cd26b2df
Fix test and actually check that we get hasAuthentication called for different domains
7 years ago
Jordi Boggiano
9850621c6b
Merge pull request #6788 from GawainLynch/symfony-4
...
Symfony 4
7 years ago
Jordi Boggiano
0b3bc4ccb9
Merge branch '1.5'
7 years ago
johnstevenson
b0922b95af
Report multiple inis in php.ini specific messages
...
Where systems use multiple ini files it is perhaps more useful to
suggest running `php --ini` to see their locations, rather than showing
the loaded php.ini (if one exists).
7 years ago
Nils Adermann
7dffe79a0f
Update tests of solver problem message to match new message
7 years ago
Robert Lu
3ce71a55bf
fix unittest
7 years ago
Gawain Lynch
f74c6f4620
Update tests to handle optional QuestionHelper::setInputStream() availability
7 years ago
Gawain Lynch
157075b996
Migrate ConsoleIO::select to use QuestionHelper and ChoiceQuestion
7 years ago
Jordi Boggiano
26a50b3762
Merge branch '1.5'
7 years ago
Jordi Boggiano
4ab34c22fa
Merge pull request #6740 from croensch/master
...
also support NO_PROXY
7 years ago
Jérôme Vasseur
71c2ecbace
Fix platform package detection in VersionParser
7 years ago
Jordi Boggiano
9a99e86ebc
Rename NonRoot to Transitive, refs #6674
7 years ago
Jordi Boggiano
9df22654c3
Merge remote-tracking branch 'grasmash/issue-6661-whitelist-all-deps'
7 years ago
croensch
6da92e98ac
also support NO_PROXY
...
since WINDOWS can only have one case and that is usually upperase
7 years ago
Matthew Grasmick
776977f597
Fixing method name.
7 years ago
Vladimir Reznichenko
c8615358cb
SCA with PHP Inspections (EA Extended)
7 years ago
Matthew Grasmick
11db6f90c2
Cleaning up comments
7 years ago
Matthew Grasmick
3826e51caa
Renaming some methods and props.
7 years ago
Matthew Grasmick
ad465aa769
Updating var names.
7 years ago
Matthew Grasmick
21722f6e42
Fixing test version constraints.
7 years ago
Matthew Grasmick
f29e98cdf9
Fixes #6661 : Allow a given package and its dependencies (including siblings) to be updated.
7 years ago
Jordi Boggiano
dae575c197
Merge branch '1.5'
7 years ago
Deamon
3d753b117b
add test on remove mainkey at end of file
7 years ago
Jordi Boggiano
a8df30c09b
Merge branch '1.5'
7 years ago
Mikk Tendermann
2a89d37651
fix gitlab not telling visibilty if user is not logged in
7 years ago
Christian Ramelow
f178c340e9
Fixed tests.
7 years ago
Christian Ramelow
39d8104897
Introduces a new method `copy()`.
...
Some packages, e. g. `tm/tooly-composer-script`, are using the composer classes to e. g. create symlinks or perform other file operations. While there's only a `copyThenRemove()` method this commit introduces a new `copy()` method. `copy()` behaves the same as the copy part of `copyThenRemove()` did with one exception: it returns `true` on success and `false` on failure. Copying a directory may lead to a `false`, while the whole directory or some of its files couldn't been copied. To ensure backwards compatibility `copyThenRemove()` calls `copy()` now. This commit also adds the necessary tests.
7 years ago
Jordi Boggiano
e33d00f98e
Fix gitlab tests
7 years ago
Jordi Boggiano
f420d31233
Fix application test
7 years ago
Jordi Boggiano
a6c4fb2dcf
Fix gitlab tests
7 years ago
Jordi Boggiano
c89f6338c2
CS tweaks, refs #6592
7 years ago
Helmut Januschka
ae42e4f8a3
php 5
7 years ago
Helmut Januschka
bc4a7834ba
php 5 being php5 :/
7 years ago
Helmut Januschka
b847270d08
rename test method
7 years ago
Helmut Januschka
b486056066
add tests for gitlab paging
7 years ago
Jordi Boggiano
b07be842a0
Remove feature-branches option as it is misnamed and duplicates the non-feature-branches option, refs #6475
7 years ago
Jordi Boggiano
6832eacb01
Update GitLab API usage to v4, fixes #6453
7 years ago
Jordi Boggiano
65d49bf811
Merge branch '1.4'
7 years ago
Jordi Boggiano
d2b102ecb9
Merge remote-tracking branch 'svenmuennich/pr/fix-require-command' into 1.4
7 years ago
Sergey Shcherbin
118abacd14
Fix for time format in GitBitbucketDriver test
7 years ago
Jordi Boggiano
34dbde3873
Merge branch '1.4'
7 years ago
Sven Münnich
d51ef83a43
Fix case insensitivity of ‘require’ command
...
When currently executing the `require` command for a package that is already listed in `require(-dev)`, one must use the exact same, case matching package name as written in `composer.json`. That is, if one changes the case of a character in the package name, the `require` command will add a new entry to `require(-dev)`, instead of updating the existing one.
This commit fixes the described behaviour to make it consistent with other commands like `update` that are already case insensitive.
7 years ago
Rob Bast
422a9adb07
images related to new trusty images
7 years ago
Jordi Boggiano
ef47d8bf05
Merge pull request #6486 from WilHall/feature/htaccess-protect-option
...
Add htaccess-protect option for disabling the creation of .htaccess files
7 years ago
Jordi Boggiano
91a4e76958
Merge pull request #6460 from bmax/master
...
Cache: clear cache using removeDirectory
7 years ago
Brandon Max
24b8fea48a
Cache: clear cache using removeDirectory
7 years ago
Wil Hall
f0924fb878
Add htaccess-protect option for disabling the creation of .htaccess files
7 years ago
Jordi Boggiano
7cee8e385f
Merge branch '1.4'
7 years ago
Jordi Boggiano
cc9234562d
Merge pull request #6475 from NamelessCoder/featurebranches
...
Add support for feature-branches setting
7 years ago
Claus Due
965f1f42d1
Add support for feature-branches setting
...
A negative list of non-feature-branches names
is already supported - this patch adds a list of
branches names which *will* be considered as
feature branches.
Allows changing the currently hardcoded set of
expected feature branch names, from:
* master|trunk|default|develop
To any set of names or patterns that you desire.
7 years ago
Sergey Shcherbin
292882f0d0
Fix for time format in GitBitbucketDriver test
7 years ago
Nils Adermann
b1110df873
Merge pull request #6371 from balbuf/balbuf/move-all-plugins
...
Move all plugins and their dependencies to the front
7 years ago
Stephen Beemsterboer
06bb6c7530
Move plugins with no dependencies to the front, followed by plugins with their dependencies
7 years ago
Remi Collet
741c8d63fb
fix test for Symfony 3.2
7 years ago
Remi Collet
95d82f6fde
fix test for json-schema 5.2
7 years ago
Martin Hasoň
88ec172bd8
Fix CS
7 years ago
Martin Hasoň
d1ba698291
Fix PHP 5.3 compatibility
7 years ago
Martin Hasoň
3c5bfcf1e9
Register github repository type
7 years ago
Jordi Boggiano
a6627d55b7
Fix build
7 years ago
Jordi Boggiano
ce56fc4ab6
Merge pull request #6381 from deeky666/pass-vsc-driver-options
...
Forward GitLab driver options to remote filesystem
7 years ago
Jordi Boggiano
c917c52f81
Message tweak, refs #6341
7 years ago
AjiYakin
8858b27ced
Warn identical names w/ different capitalization - extract zip archive
...
Warn about identical names with different capitalization on zip archive
extract failure (Not a directory)
Issue #5938
7 years ago
Steve Müller
1d29fa04b1
forward GitLab driver options to remote filesystem
8 years ago
Rob Bast
e2eb8f2201
support for gitlab subgroups, closes #6349
8 years ago
Stephen
6c4800b8d2
Update corresponding test for plugin moving
8 years ago
Jordi Boggiano
e3a23c0047
Merge branch '1.4'
8 years ago
Jordi Boggiano
75416c69b4
Merge pull request #6340 from derrabus/remove-control-chars-from-suggest
...
Remove ANSI control characters from suggested packages output
8 years ago
Alexander M. Turek
20050dd984
Remove console formatting as well.
8 years ago
Jordi Boggiano
3c1e7a67cf
Merge branch '1.4'
8 years ago
Jordi Boggiano
9b3c9e0c26
Fix tests
8 years ago
Jordi Boggiano
123e8956c7
Merge pull request #6337 from theotonge/bugfix-5989
...
Fix for https://github.com/composer/composer/issues/5989
8 years ago
Alexander M. Turek
401ef69ae3
Remove ANSI control characters from suggested packages output.
8 years ago
Theo Tonge
c077df0d80
Fix for https://github.com/composer/composer/issues/5989
...
Enforce yes/no answers for Confirmation Questions
8 years ago
Jordi Boggiano
2c03dab4c3
Merge branch '1.4'
8 years ago
Jordi Boggiano
be201924cd
Revert "Changes the query string parameter `sha` to `ref` to reflect the GitLab API"
...
Fixes #6344 , refs #6198
This reverts commit 8a496cd2a7
.
8 years ago
Nicole Cordes
d834fcfac5
Change commitHash to match real life examples
8 years ago
Nicole Cordes
c0f5a64e81
Use long array sysntax for PHP 5.3 compatibility
8 years ago
Nicole Cordes
c2fe198ebc
Re-add unit test for FETCH_HEAD parsing
8 years ago
Nicole Cordes
313e6b914d
Fix Git branch parsing for detached HEAD on a commit
...
Current versions of Git output the commit hash as detached HEAD instead
of FETCH_HEAD. The VersionGuesser should be able to handle commit hashes
as well as FETCH_HEAD to detect the correct branch of a commit.
8 years ago
Jordi Boggiano
61511cfed6
Fix CS issues, refs #6159
8 years ago
Jordi Boggiano
0a337e7c75
Merge remote-tracking branch 'gza/fix_unzip_on_win_php56'
8 years ago
Jose Miguel Pérez Ruiz
4ba3c741f5
Fix Init Command to accept author names with Unicode combining diacritical marks
8 years ago
Jose Miguel Pérez Ruiz
b2f62bc06c
Fix Init Command to accept author names with Unicode combining diacritical marks
8 years ago
Guillaume ZITTA
f89e01d622
switch first / fallback order
8 years ago
Jordi Boggiano
843877cd6d
Fix hg version guessing, fixes #6236 , fixes #6235
8 years ago
Filippo Tessarotto
04b1ddb79f
VersionGuesser test for HG
8 years ago
Jordi Boggiano
122e422682
CS fixes
8 years ago
Jordi Boggiano
ddef9923b0
Merge branch '1.3'
8 years ago
Sjoerd Adema
8a496cd2a7
Changes the query string parameter `sha` to `ref` to reflect the GitLab API
...
Updated the unit test to reflect the change
Fixes #6198
8 years ago
Jordi Boggiano
f200343cf2
Fix gitlab driver issues not asking for auth when token is missing, and not falling back properly to git driver
8 years ago
Jordi Boggiano
44ea284ab9
Merge remote-tracking branch 'stefangr/implement_bitbucket_api_v2'
8 years ago
Jordi Boggiano
c61a1c7523
Merge branch '1.3'
8 years ago
Jordi Boggiano
260b85882f
Merge remote-tracking branch 'dzuelke/installmsgs' into 1.3
8 years ago
rubenrua
4e1887a721
Improve memory usage resolving dependencies
...
It is known that composer update takes a lot of memory: #5915 , #5902 ,
I am playing with a profiler (@blackfireio) to make a demo in my local
PHP meetup (@phpvigo) and I found out a way to use less memory. These
are my first tests:
* Private project using PHP 5.6:
* Memory: from 1.31GB to 1.07GB
* Wall Time: from 2min 8s to 1min 33s
* symfony-demo using PHP 7.1 in my old mac book:
* Memory: from 667MB to 523MB
* Wall Time: from 5min 29s to 5min 28s
Not use an array inside conflict rules is this improvement main idea:
```php
<?php
//Memory 38MB
gc_collect_cycles();
gc_disable();
class Rule
{
public $literals;
public function __construct(array $literals)
{
$this->literals = $literals;
}
}
$rules = array();
$i = 0;
while ($i<80000){ //
$i++;
$array = array(-$i, $i);
$rule = new Rule($array);
$rules[] = $rule;
}
```
```php
<?php
//Memory 11.1MB
gc_collect_cycles();
gc_disable();
class Rule2Literals
{
public $literal1;
public $literal2;
public function __construct($literal1, $literal2)
{
$this->literal1 = $literal1;
$this->literal2 = $literal2;
}
}
$rules = array();
$i = 0;
while ($i<80000){ //
$i++;
$rule = new ConflictRule(-$i, $i);
$rules[] = $rule;
}
```
More info https://github.com/composer/composer/pull/6168
8 years ago
Guillaume ZITTA
abf06913a2
remove useless expect (already done by docstring)
8 years ago
Guillaume ZITTA
921ffe741f
Cleaner fallback Algorithm
8 years ago
Jordi Boggiano
20c16f18f5
Merge branch '1.3'
8 years ago
Jordi Boggiano
f3d0e4660d
Fix urlencoding of gitlab dots, fixes #6064
8 years ago
David Zuelke
2d36324e99
streamline install progress messages
8 years ago
Stefan Grootscholten
5dbdefdd72
Implement ordering in requesting tags and branches.
...
Update unit test with latest changes.
8 years ago
Stefan Grootscholten
7ae4ed1ec8
Improve fetching single files via bitbucket API.
...
The former implementation used the 'src' endpoint which returned some meta data as well.
This has been replaced with the 'raw' endpoint which does not return the meta data and does not need an extra JSON decode step.
8 years ago
Stefan Grootscholten
d25c483231
Implement Bitbucket API version 2.0 (where applicable).
8 years ago
Stefan Grootscholten
512750a20e
Add more tests to cover the new functionality.
8 years ago
Stefan Grootscholten
a4af559ca8
Store access-token for re-use
...
Store the Bitbucket access-token (and the expiration time) so it can be re-used within the time it is valid.
The Bitbucket::requestToken and Bitbucket::getToken now only return the access-token and not all other parameters it receives from the Bitbucket API.
8 years ago
jbixler
dac51c7f4b
Add ignore filters option to archive command
8 years ago
Christophe Coevoet
1cb0ec7911
Resolve references in ComposerSchemaTest
8 years ago
johnstevenson
2b8ad7dc2a
Clear xdebug version if restart fails, fixes #5995
8 years ago
Jordi Boggiano
2782d37a15
Merge pull request #5992 from AnrDaemon/fix-git-skips-proper
...
Properly skip GitDownloaderTest if git is not available
8 years ago
AnrDaemon
1d2a949e3e
Properly fix git excludes.
...
Mindless copy-paste never gets old. Sorry. This is fixed proper this time.
8 years ago
AnrDaemon
810e70d234
Fix __DIR__/getcwd() inconsistency.
8 years ago
Jordi Boggiano
df5fd3ba09
Cache executable finder calls
8 years ago
AnrDaemon
ab70601700
Skip git-related tests if no git found.
8 years ago
johnstevenson
3928f1f3be
Set xdebug version in environment, fixes #5967
8 years ago
Jordi Boggiano
a1b468ea50
Fix git shortening, it is sunday..
8 years ago
Jordi Boggiano
98c5f825e0
Fix tests and regression in @ref script handling
8 years ago
Jordi Boggiano
4d77ffcb4a
Merge branch 'simplify-output'
8 years ago
Jordi Boggiano
4d082f77b8
Simplify composer output to take less lines
8 years ago
Jordi Boggiano
e54c7478ee
Attempt at fixing support for git 2.11, refs #5942
8 years ago
Jordi Boggiano
1dcb2b5758
Merge remote-tracking branch 'nicolas-grekas/apcu'
8 years ago
Jordi Boggiano
e9d04f2b2d
Merge branch '1.2'
8 years ago
Hans-Joachim Michl
817b2747c7
Fix #5672
...
This fixes the issue reported in #5672 .
It just makes sure the ZendGuard encoded files can be autoloaded correctly.
8 years ago
Dries Vints
2ab7df5566
Do not add newlines to output
8 years ago
Nicolas Grekas
6d4e60b991
Add --apcu-autoloader option to enable APCu caching of found/not-found classes
8 years ago
Jordi Boggiano
f3f063e3e2
Merge pull request #5888 from alcohol/array-default
...
use array as default value
8 years ago
Rob Bast
873f17261c
try to fix test instead of guarding implementation
8 years ago
Jordi Boggiano
8a2f597db3
Fix tests
8 years ago
Jordi Boggiano
91e7372c6e
Backport update packagist default repo to be packagist.org
8 years ago
johnstevenson
c1058cf37c
Fix XdebugHandler test
8 years ago
johnstevenson
379fb70ad9
Use random name for tmp ini and delete after use
...
Thanks to Patrick Rose for reporting this issue.
8 years ago
Jordi Boggiano
8ad6385ffb
Merge remote-tracking branch 'fabpot/more-debug'
8 years ago
Jordi Boggiano
43903a3979
Merge branch '1.2'
8 years ago
Jordi Boggiano
98a599d6c3
Merge pull request #5843 from stof/enforce_map_types
...
Enhance the json schema with validation for map objects
8 years ago
Jordi Boggiano
9801d831ed
Merge pull request #5852 from fabpot/io-fix
...
Remove usage of echo when executing Composer script
8 years ago
Jordi Boggiano
d6499b7c4a
Merge pull request #5748 from kassner/hgdriver-bitbucket
...
HgDriver does not identify bitbucket mercurial repos correctly
8 years ago
Fabien Potencier
103624d4ed
Remove usage of echo when executing Composer script
8 years ago
Christophe Coevoet
1882f9a502
Enhance the json schema with validation for map objects
8 years ago
Jordi Boggiano
208086d8e3
Merge remote-tracking branch 'channelgrabber/GitSpeedIncrease'
8 years ago
Jordi Boggiano
adee0ff132
Fix tests
8 years ago
Jordi Boggiano
e38ebefc7e
Update packagist default repo to be packagist.org
8 years ago
Fabien Potencier
57ec0d1815
added more information in the output
8 years ago
Richard Heelin
c2f6c61f56
Updated the tests to match the new command that is executed
8 years ago
Jordi Boggiano
d9328ed5ae
Merge pull request #5753 from alcohol/use-rfc3339-in-arraydumper
...
bring arraydumper in line with json schema spec and packagist
8 years ago
Konstantin.Myakshin
dc70b40d34
Use implode instead of join
8 years ago
Jordi Boggiano
d1867d5859
Merge branch '1.2'
8 years ago
Jordi Boggiano
5ee22f25ba
Rework JSON matching to use a properly recursive pattern, fixes #5771
8 years ago
Jordi Boggiano
092dec9596
Add failing test for #5771
8 years ago
Jordi Boggiano
183398fe5e
Merge pull request #5717 from berlinger-rarents/fix/5584_anon_redirect_bitbucket
...
prevent (prompt for) bitbucket auth when it redirected
8 years ago
Jordi Boggiano
c540dace8c
Merge pull request #5765 from fabpot/remove-obsolete-code
...
removed obsolete code
8 years ago
Jordi Boggiano
4cd6eabdba
Merge branch '1.2'
8 years ago