diff options
| author | Raphael Sofaer <raphael@joindiaspora.com> | 2011-06-29 04:13:38 +0400 |
|---|---|---|
| committer | Raphael Sofaer <raphael@joindiaspora.com> | 2011-06-29 04:13:38 +0400 |
| commit | 1af945de11739eeda625164290867138e9416610 (patch) | |
| tree | cba0753a4f5c5947b03c2270a34c8bb5c3adbf5f /.gitignore | |
| parent | 7fd9b81e555ff2baa5019ca3ae3d4bb340bd2e64 (diff) | |
| parent | 7ba80ce7992064956b57df7b4bfe3e53100394a5 (diff) | |
Merge branch 'master' into oauth
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f76a27a59..d41e137f4 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,10 @@ spec/fixtures/*.y*ml spec/fixtures/*.fixture.* coverage/* +#Documentation +.yardoc/ +doc/ + # Uploaded files and local files public/uploads/* public/assets/* |