Merge branch 'master' into 'develop' · e0d4c06741 - ozgurkon-site - Özgür Yazılım Derneği Git sunucusu

Merge branch 'master' into 'develop'

# Conflicts:
#   .firebaserc

master

Igor Laborie 6 years ago

parent 38426e2c49

commit e0d4c06741

1 changed files with 1 additions and 1 deletions

								
									2

.firebaserc

								Unescape
								Escape
							
									View File
								
					@ -1,6 +1,6 @@
				
					{
					
					{
				
					  "projects": {
					
					  "projects": {
				
					    "default": "sandbox-devfesttoulouse",
					
					    "default": "sandbox-devfesttoulouse",
				
					    "prod": "2019-devfesttoulouse"
					
					    "prod": "devfesttoulouse-1f1dc"
				
					  }
					
					  }
				
					}
					
					}