Andreas Fischer 01a176b3d3 Merge branch 'master' into php5 ...

* master:
  Add api target to phing build script.
  Add sami configuration file.
  Add sami/sami 1.* as a development dependency.

Conflicts:
	composer.lock

2014-07-20 21:22:19 +02:00

..

build.xml

Add api target to phing build script.

2014-07-19 01:10:30 +02:00

code-sniffer-ruleset-tests.xml

Apply coding guidelines (with exceptions) to the tests directory.

2014-02-15 20:05:30 +01:00

code-sniffer-ruleset.xml

Check for old-style constructor names via Code Sniffer.

2014-06-16 17:06:18 +02:00

sami.conf.php

Add sami configuration file.

2014-07-19 01:04:18 +02:00