| 
							
							
								 jeroenpraat | 3a89bb0db2 | fix image path | 2015-10-20 17:25:44 +02:00 |  | 
			
				
					| 
							
							
								 Paolo Tacconi | 8da8e02dc8 | Replaced some old redmatrix branding | 2015-10-19 10:51:33 +02:00 |  | 
			
				
					| 
							
							
								 redmatrix | e271035879 | provide a warning | 2015-05-17 23:06:00 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | dd72f580dd | update readme | 2015-05-17 16:40:42 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | 51b89f0ed8 | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts:
	doc/DerivedTheme1.md
	doc/Developers.md
	doc/Features.md
	doc/Plugins.md
	doc/Privacy.md
	doc/README.md
	doc/Remove-Account.md
	doc/Translations.md
	doc/about.bb
	doc/account_basics.bb
	doc/accounts_profiles_channels_basics.bb
	doc/addons.bb
	doc/addons_gnusocial.bb
	doc/bbcode.html
	doc/campaign.bb
	doc/classRedmatrix_1_1Import_1_1Import-members.html
	doc/classRedmatrix_1_1Import_1_1Import.html
	doc/cloud.bb
	doc/connecting_to_channels.bb
	doc/connecting_to_channels.md
	doc/credits.bb
	doc/de/channels.bb
	doc/de/features.bb
	doc/de/main.bb
	doc/de/registration.bb
	doc/developers.bb
	doc/encryption.bb
	doc/external-resource-links.bb
	doc/extra_features.bb
	doc/faq_admins.bb
	doc/faq_developers.bb
	doc/faq_members.bb
	doc/features.bb
	doc/hidden_configs.bb
	doc/history.md
	doc/html/index.php
	doc/main.bb
	doc/permissions.bb
	doc/plugins.bb
	doc/problems-following-an-update.bb
	doc/profiles.bb
	doc/red2pi.bb
	doc/registration.bb
	doc/roadmap.bb
	doc/sv/main.bb
	doc/what_is_zot.bb
	doc/zot.md | 2015-05-13 19:23:13 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | 364025e550 | remove project name dependency from most of the doc files to ease project merging, there are going to be some edge cases requiring manual tweaking as most of this was done by script. | 2015-05-13 17:59:45 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | 2c7a4c254d | correcting upstream | 2015-05-10 13:30:30 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | ecbe01e3f7 | i think this is 100 | 2015-05-05 13:42:05 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | ae1d0e5e75 | update 99 | 2015-05-05 04:40:41 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | 57fcfc9398 | iteration #97 | 2015-05-05 01:25:27 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | b22ae35c1a | this will settle down eventually. | 2015-05-05 01:10:45 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | fd79c59865 | are we there yet? | 2015-05-04 21:49:48 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | 25c861c819 | readme, ad nauseum | 2015-05-04 21:38:53 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | c57a1441f2 | readme, yet again | 2015-05-04 21:23:47 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | e6a2095aa6 | readme | 2015-05-04 21:20:19 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | 7a63a88bdf | readme | 2015-05-04 21:14:08 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | 78bf3e4c25 | readme | 2015-05-04 18:51:31 -07:00 |  | 
			
				
					| 
							
							
								 friendica | c857c5a648 | updated README | 2014-05-30 15:52:40 -07:00 |  | 
			
				
					| 
							
							
								 friendica | be0197a3a0 | pull in some doco from the project wiki, keep it with the code | 2013-11-18 19:17:25 -08:00 |  |