diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-02-18 15:33:29 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-02-18 15:33:29 -0600 |
| commit | 4d8be4fe0d82c13c0a4d0fb454c422449bdfafe2 (patch) | |
| tree | b9be37aef8bb0284f011fe56e0c6d02cf404aba7 /.gitignore | |
| parent | 63352aaf70d97a37b6277fab0f9b957d34dcb9df (diff) | |
| parent | a45631e3f3791071571da3a59bf6d3ecad42033f (diff) | |
| download | mediagoblin-4d8be4fe0d82c13c0a4d0fb454c422449bdfafe2.tar.lz mediagoblin-4d8be4fe0d82c13c0a4d0fb454c422449bdfafe2.tar.xz mediagoblin-4d8be4fe0d82c13c0a4d0fb454c422449bdfafe2.zip | |
Merge branch 'master' into sqlmigrate
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -15,6 +15,7 @@ /user_dev/ /paste_local.ini /mediagoblin_local.ini +/mediagoblin.db /server-log.txt # Tests |