Skip to content
Snippets Groups Projects
Commit 35a59d39 authored by danielvincent's avatar danielvincent
Browse files

Merge branch 'master' of github.com:diaspora/diaspora

parents 0a4bf225 ea36790e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
.gitignore
+ 1
− 1
View file @ 35a59d39
......@@ -13,7 +13,7 @@ public/stylesheets/ui.css
# Uploded files and local files
public/uploads/*
public/source.tar
public/source.tar*
tmp/**/*
db/*.sqlite3
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment