Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/timster/gallery
Browse files Browse the repository at this point in the history 
Conflicts:
	gallery/settings.py
  • Loading branch information
@timster
timster committed Apr 2, 2014
2 parents 72c517f + 6a6bbda commit 8b9e4e5
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 8b9e4e5

Please sign in to comment.