[Pkg-debile-commits] [debile-web] 06/06: Merge remote-tracking branch 'github/with-apt'

[Léo Cavaillé]

This is an automated email from the git hooks/post-receive script.

leo.cavaille-guest pushed a commit to branch master
in repository debile-web.

commit 184cacdfed10d9b7ca3b2982cfc39eae29a65813
Merge: 18f6dfc fa9826b
Author: Léo Cavaillé <leo at cavaille.net>
Date:   Mon Aug 26 22:39:40 2013 +0200

    Merge remote-tracking branch 'github/with-apt'
    
    Conflicts:
    	debileweb/blueprints/frontend.py

 debileweb/blueprints/frontend.py     |   30 ++++++++++++++++++++++++------
 templates/hacker.html                |   23 ++++++++++++++++++++---
 templates/{about.html => index.html} |    3 +--
 3 files changed, 45 insertions(+), 11 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git