Procházet zdrojové kódy

Merge branch 'master' of https://git.radicalnetworks.org/chootka/radical-networks

chootka před 5 roky
rodič
revize
3ae3bd8af8
2 změnil soubory, kde provedl 11 přidání a 9 odebrání
  1. 8 6
      .gitlab/issue_templates/Proposal.md
  2. 3 3
      README.md

+ 8 - 6
.gitlab/issue_templates/Proposal.md

@@ -1,10 +1,10 @@
-## Radical Networks 2018 Proposal  
+## Radical Networks 2019 Proposal  
 
 Replace sample info between [brackets] with your own!
 
-**Format**: [Talk / Panel / Workshop / Artwork / Performance]  
+**Format**: [Talk / Panel / Workshop / Artwork / Performance / etc...]  
 **Name**: [Jane Doe]  
-**Location**: [Berlin, Germany]  
+**Location**: [NYC, NY]  
 **Email**: [janedoe@youremail.com]  
 **Twitter**: [@janedoe]  
 **Repo**: [url to your code repository, aka GitHub, GitLab, Bitbucket, etc]   
@@ -39,8 +39,10 @@ Replace sample info between [brackets] with your own!
 *Please adhere to these guidelines:*    
 Talks: 15 - 30 minutes with 10 minutes for questions.  
 Panels: 30 minutes with 10 minutes for questions.  
+Lunchtime Meetups: up to 1h.  
 Workshops: 1h - 6hrs.  
-Performances: up to 60 minutes.  
+Tour/Field Trips: up to 6hrs.  
+Performances / Film Screenings: up to 90 minutes.  
 
 
 
@@ -63,7 +65,7 @@ Performances: up to 60 minutes.
 
 
 
-Artworks must be installed on **Friday October 19th, 2018**.  
+Artworks must be installed on **Friday October 18th, 2019**.  
 
 *Note: We are not responsible for damages done to your work! (Although we will take every precaution we can to safely handle your work.)*  
 
@@ -84,4 +86,4 @@ Artworks must be installed on **Friday October 19th, 2018**.
 
 
 
-/label ~"radnets2018"
+/label ~"radnets2019"

+ 3 - 3
README.md

@@ -1,6 +1,6 @@
 # radical-networks
 
-October 19-21, 2018
-Berlin, Germany
+October 18-20, 2019
+New York City, NY
 
-Details at http://radicalnetworks.org/
+Details at https://radicalnetworks.org/