Merge branch 'master' of ssh://srv2.wpitchoune.net/srv/git/www
authorJean-Philippe Orsini <jeanfi@gmail.com>
Wed, 15 Jun 2016 14:15:20 +0000 (16:15 +0200)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Wed, 15 Jun 2016 14:15:20 +0000 (16:15 +0200)
1  2 
www/style.css

diff --cc www/style.css
Simple merge