Skip to content

Commit

Permalink
Merge branch 'pr/1' into gh-pages
Browse files Browse the repository at this point in the history
Slo sammen manuelt...

Conflicts:
	README.md
  • Loading branch information
SverreWisloff committed Feb 12, 2015
2 parents 142b936 + e314706 commit a218cc2
Show file tree
Hide file tree
Showing 14 changed files with 7 additions and 1 deletion.
Binary file added Presentasjoner 2013/01 Velkommen - Sverre.pptx
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[InternetShortcut]
URL=http://prezi.com/0eialkzjtctg/osgeo-versjon-2/
IconFile=https://prezi-a.akamaihd.net/assets/common/img/favicon.ico
IconIndex=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[InternetShortcut]
URL=http://docs.atlefren.net/foss4gno/#/
Binary file not shown.
Binary file not shown.
Binary file added Presentasjoner 2013/FOSSatSK_13.pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FOSS4G.no - 2015

Drevet av _studentmiljøet_. Arrangeres på universitet eller lignende. Gratis deltakelse. Sponsorer dekker utgifter og potensiell inntekt til "studentkassa". GeoForum bidrar med koordinering og sørger for kontinuitet.

* NMBU: Atlas ved Eirik Aabøe <eirikaaboe@gmail.com>, Jørgen Kvalberg
* NMBU: Atlas ved Joakim Tveit Husefest <joakim.husefest@gmail.com>
* NTNU: Anne Sofie <[email protected]>
* HIG: Sverre Stikbakke <[email protected]>
* UiO: ???
Expand Down

0 comments on commit a218cc2

Please sign in to comment.