diff options
| author | Tom Gregory <[email protected]> | 2013-01-22 00:23:04 -0500 |
|---|---|---|
| committer | Tom Gregory <[email protected]> | 2013-01-22 00:23:04 -0500 |
| commit | 98b806652bab694797c0d09b41f198b7bf6f2c4c (patch) | |
| tree | 077eefaaea3098418fa9eea317b87a854abd6f51 /.gitignore | |
| parent | 349532a2c5b8d968f8fa7743b33b8d50d3525630 (diff) | |
| parent | 6391acb3371e07742cf94c7c4bc4cc3888a6cae5 (diff) | |
Merge remote-tracking branch 'upstream/develop' into dev-multi. Updated documentation to rat format, and tests to use phpunit.
(Resolved)Conflicts:
README.markdown
idiorm.php
test/test_queries.php
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1,2 +1,4 @@ *.swp *.sqlite +docs/_build +/phpunit.phar |