harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync abook entries from redmatrix

Browse Source 
Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
This commit is contained in:
redmatrix
2015-07-02 21:58:28 -07:00
parent 8b2b92fe32 54301a9ff5
commit 1a5898bf80
12 changed files with 1036 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/main.bb
View File

@@ -37,7 +37,6 @@ Zot is the great new communicaton protocol invented especially for the $Projectn
[h3]Administrators Help[/h3]
[zrl=[baseurl]/help/install]Install[/zrl]
[zrl=[baseurl]/help/debian_install]Easy Install on Debian via script[/zrl]
[zrl=[baseurl]/help/red2pi]Installing Red on the Raspberry Pi[/zrl]
[zrl=[baseurl]/help/troubleshooting]Troubleshooting Tips[/zrl]
[zrl=[baseurl]/help/hidden_configs]Tweaking $Projectname's Hidden Configurations[/zrl]