Merge branch 'master' into develop · f32c34c726 - MERELEC | GOGS

Merge branch 'master' into develop

Conflicts:
	.gitignore

Torkel Ödegaard 11 years ago

parent

99259d246b 15cb1d8980

commit

f32c34c726

1 changed files with 1 additions and 2 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 2
						
.gitignore
							 
								View File
							
				@@ -18,8 +18,7 @@ src/css/*.min.css
			
				 /data/*
			
				 /bin/*
			
				-/grafana-pro
			
				-/grafana
			
				 conf/custom.ini
			
				 fig.yml
			
				+