bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'thomasb/master'

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Andreas Stephanides
2013-07-26 00:44:11 +02:00
parent 92f1797dfb c6e7584253
commit c922c64897
6 changed files with 91 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -16,3 +16,7 @@
/tmp
/config/initializers/devise.rb
/app/doc/*
console
/server
/public/uploads/