Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 14:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://github.com/friendica/friendica

Browse source 
Conflicts:
	boot.php
	database.sql
	include/template_processor.php
	update.php
This commit is contained in:
Alexander Kampmann 2012-03-22 12:50:02 +01:00
commit cea7ca1df4
498 changed files with 24369 additions and 11652 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.htaccess
View file

@ -1,4 +1,4 @@
#Options -Indexes
Options -Indexes
AddType application/x-java-archive .jar
AddType audio/ogg .oga