Nikita Popov f291a19fd5 Merge branch '3.x' ...

Conflicts:
	lib/PhpParser/Parser/Php7.php

2017-02-26 23:13:21 +01:00

..

Multiple.php

Update doc comments after previous comment

2017-01-26 00:16:54 +01:00

Php5.php

Merge branch '3.x'

2017-02-09 20:38:33 +01:00

Php7.php

Merge branch '3.x'

2017-02-26 23:13:21 +01:00

Tokens.php

Move token constants into separate class

2015-06-13 18:39:55 +02:00