git.mxchange.org Git - friendica.git/commit - js/acl.js

]> git.mxchange.org Git - friendica.git/commit - js/acl.js

projects / friendica.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 82c0066 3742d0d)

author	Michael Vogel <icarus@dabo.de>
	Sun, 20 Jan 2013 13:07:57 +0000 (14:07 +0100)
committer	Michael Vogel <icarus@dabo.de>
	Sun, 20 Jan 2013 13:07:57 +0000 (14:07 +0100)
commit	4e3d0018c69eaaa122f004357c5c68dacef59fc7
tree	ed1f6c5d3954776f074887a5fb614c53c53f9618	tree \| snapshot
parent	82c00660e099070cf4dee8de82c2023d1232ef8d	commit \| diff
parent	3742d0d5babd8947fdcf5a33db90035541a5fe75	commit \| diff

Merge remote-tracking branch 'upstream/master'

Conflicts:
boot.php
include/items.php
update.php

boot.php	diff1 \|	diff2 \|	blob \| history
database.sql	diff1 \|	diff2 \|	blob \| history
include/bbcode.php	diff1 \|	diff2 \|	blob \| history
include/conversation.php	diff1 \|	diff2 \|	blob \| history
include/items.php	diff1 \|	diff2 \|	blob \| history
include/text.php	diff1 \|	diff2 \|	blob \| history
object/Item.php	diff1 \|	diff2 \|	blob \| history
update.php	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.