Commit Graph

7 Commits

Author SHA1 Message Date
redmatrix
5733491ac8 more work on items
and

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

Conflicts:
	include/items.php
	view/it/messages.po
	view/it/strings.php
2015-06-11 17:56:56 -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
friendica
a496036066 local_user => local_channel 2015-01-28 20:56:04 -08:00
friendica
bae3029c63 merge madness 2014-10-19 16:12:05 -07:00
habeascodice
5f58603158 relevant now that site statistics are all the hotness 2014-09-28 19:32:13 -07:00
root
a47971aefd Some doco work. Changed main.bb and added a return link to all .bb files and began planning new entries for user orientated documentation. 2014-06-29 18:32:40 +02:00
Thomas Willingham
29f6975715 Import doco from docs@friendicared.net 2014-02-24 05:13:28 +00:00