Skip to content

Commit

Permalink
Merge branch 'master' into lugmap.linux.it
Browse files Browse the repository at this point in the history
Conflicts:
	ToDo
  • Loading branch information
Gelma committed Nov 11, 2014
2 parents 9954332 + b9299c2 commit 42bbfa9
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions db/marche.txt
@@ -1,5 +1,6 @@
Ancona|FreeGLOO|Ancona|http://freegloo.wordpress.com/|qnav.fnivav@yvoreb.vg
Ancona|LUGattolica|Chiaravalle|http://lugchiaravalle.weebly.com/|f.tvnapneyv@tznvy.pbz
Ancona|PDP FSUG|Fabriano e dintorni|http://pdp.linux.it/|cqc@gncvba.vg|2098656823
Ancona|SenaLUG|Senigallia|http://www.senalug.org/|yberamb.senaprfpuvav3@tznvy.pbz
Fermo|Fermo Lug|Fermo e dintorni|http://www.linuxfm.org/|cnbyb.fvyramv@tznvy.pbz|2098656742
Macerata|Camelug|Camerino|http://camelug.unicam.it|fcevgr.yby@tznvy.pbz
Expand Down

0 comments on commit 42bbfa9

Please sign in to comment.