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 Jun 14, 2013
2 parents 644466a + ff8de23 commit 73d8d52
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 5 deletions.
2 changes: 0 additions & 2 deletions db/lazio.txt
@@ -1,8 +1,6 @@
Latina|GioveLUG|Terracina|http://www.giovelug.org/|zecna.tvbiryht@tznvy.pbz
Latina|LLG|Latina|http://www.llg.it/|naqern.yvoenyngb@tznvy.pbz
Roma|Linux4Campagnano|Campagnano di Roma|http://www.linux4campagnano.net/|n.fpngbyvav@pbzharpnzcntanab.vg|2098656803
Roma|Linux Club Italia|Roma|http://linux-club.org/|vasb@yvahkpyho.vg
Roma|LSLug - La Sapienza Linux User Group|Roma|http://www.ls-lug.org/|fncvramnyht@tznvy.pbz
Roma|Lug Roma TRE|Roma|http://www.lugroma3.org/|tenareb@cnyngvab.vg
Roma|Roma2LUG|Tor Vergata|http://lug.uniroma2.it/|ebzn2yht@tznvy.pbz|2098656829
Roma|SabaziaLug|Anguillara Sabazia e Bracciano|http://www.sabazialug.org/|re.onvgpu@gva.vg
Expand Down
1 change: 0 additions & 1 deletion db/lombardia.txt
@@ -1,5 +1,4 @@
Bergamo|BGLug|Bergamo e provincia|http://bglug.it/|erqfgneynof@tznvy.pbz
Bergamo|BGLug Valle Seriana|Gazzaniga, Valle Seriana|http://bglugvs.web3king.com/|natryb@jro3xvat.pbz
Bergamo|Linux Club Zogno|Zogno|http://www.linuxzogno.org/|geba.geba@tznvy.pbz|2098656796
Brescia|CiRcOLaB|Brescia|http://www.circolab.net/|pvepb@pvepbyno.arg
Brescia|LugBS|Brescia e provincia|http://lugbs.linux.it/|ivcf@yhtof.yvahk.vg
Expand Down
1 change: 0 additions & 1 deletion db/puglia.txt
Expand Up @@ -6,5 +6,4 @@ Brindisi|LatLug|Latiano e limitrofi|http://www.latlug.org/|tvnfbar.82@gvfpnyv.vg
Foggia|DauniaLUG|Daunia|http://daunialug.wordpress.com/|tvnzzlwrg@tznvy.pbz
Foggia|ManfredoniaLUG|Manfredonia|http://manfredonialug.linux.it/|senaxfbsg1973@tznvy.pbz
Lecce|Salento Open Source|Lecce e provincia|http://www.softwareliberosalento.it/|fbsgjneryvorebfnyragb@tznvy.pbz
Lecce|SaLug|Lecce|http://salug.it/|vasb@fnyht.vg
Taranto|MassLug|Massafra|http://masslug.wordpress.com/|znffnsenyht@tznvy.pbz|2098656816
1 change: 0 additions & 1 deletion db/sicilia.txt
Expand Up @@ -12,4 +12,3 @@ Ragusa|SoLiRa|Ragusa e provincia|http://www.solira.org/|znevb.qvenvzbaqb@tznvy.p
Siracusa|ALug|Avola|http://linuxavola.blogspot.it/|pbeely80@tznvy.pbz
Siracusa|Lug Siracusa|Siracusa e provincia|http://www.siracusa.linux.it/|tnrgnab@yvahk.vg
Siracusa|Poetry Hacklab|Palazzolo Acreide|http://museo.freaknet.org/poetry-hacklab/|cbrgel@sernxarg.bet
Trapani|Franchenstìn HackLab|Trapani|http://www.frhacklab.org/|vasb@ayfnvyf.pbz

0 comments on commit 73d8d52

Please sign in to comment.