Merge branch 'master' of https://github.com/bashrc/freedombone · 33c9bbe991 - Brendan Abolivier · Gitea

Merge branch 'master' of https://github.com/bashrc/freedombone

Bob Mottram 7 years ago

parent

cd8e01922c 480fae38bc

commit

33c9bbe991

1 changed files with 0 additions and 1 deletions

Split View Show Diff Stats

						
							+ 0
							
							- 1
						
doc/EN/meshindex.orgView File
								
				@@ -10,7 +10,6 @@
			
				10
			
				10
			
				 [[file:images/logo.png]]
			
				11
			
				11
			
				12
			
				12
			
				 * Welcome to the Freedombone Mesh
			
				13
			
				->>>>>>> 9b2ac0e151a7d39cc6d29d10c465e88e1882efec
			
				14
			
				13
			
				15
			
				14
			
				 #+BEGIN_EXPORT html
			
				16
			
				15
			
				  <center>