Skip to content

Commit

Permalink
Merge branch 'master' into lugmap.linux.it
Browse files Browse the repository at this point in the history
Conflicts:
	script/WiMegera/WiMegera.py
  • Loading branch information
Gelma committed Feb 1, 2013
2 parents 8bcf5d1 + 14e2ad0 commit 7ace9ae
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion db/veneto.txt
Expand Up @@ -10,7 +10,7 @@ Venezia|VELug|Provincia di Venezia|http://www.velug.it/|evx@yvahk.vg
Verona|LinuxLudus|Villafranca di Verona|http://www.linuxludus.it/|pneyb.oravav@yvoreb.vg|2098656806
Verona|LugVR|Verona|http://www.lugverona.it/|avpbjro313@tznvy.pbz|2098656814
Verona|Officina S3|Sommacampagna|http://www.officina-s3.org/|yvire@onehppn.pbz
Vicenza|2viLUG|Dueville|https://plus.google.com/u/0/communities/102303433105295816163/|znggvn.ztyea@tznvy.pbz
Vicenza|2viLUG|Dueville|http://dueville.linux.it|znggvn.ztyea@tznvy.pbz
Vicenza|AVi Lug|Schio, Alto Vicentino|http://www.avilug.it/|qpnirqba@tznvy.pbz
Vicenza|GrappaFSD|Bassano del Grappa|http://grappafsd.homelinux.org/|zvxr.orarggv@tznvy.pbz
Vicenza|GrappaLUG|Bassano del Grappa|http://grappalug.org/|znheb.qnyynpbfgn@tznvy.pbz|2098656758
Expand Down

0 comments on commit 7ace9ae

Please sign in to comment.