Merge remote-tracking branch 'origin/master'

Conflicts: style.css
PorteAperteSulWeb · Oct 17, 2014 · 6cc4a38 · 6cc4a38
2 parents 454134e + 8673e46
commit 6cc4a38
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/style.css b/style.css
@@ -2,7 +2,11 @@
 Theme Name: PASW 2015
 Description:
 Author: Comunità di pratica Porte aperte sul web - USR Lombardia
+<<<<<<< HEAD
 Version: 0.8.6
+=======
+Version: 0.8.5
+>>>>>>> origin/master
 Tags:
 GitHub Theme URI: https://github.com/PorteAperteSulWeb/pasw2015
 GitHub Branch: master