Michael - piratica.eu cc9ce39e3f Merge branch 'master' of https://github.com/annando/friendica ...

Conflicts:
	include/poller.php

2013-01-20 14:17:09 +01:00

..

cleanzero

newline at end of header

2013-01-11 10:00:10 -07:00

comix

newline at end of header

2013-01-11 10:00:10 -07:00

comix-plain

newline at end of header

2013-01-11 10:00:10 -07:00

darkbubble

never use profile_load outside of a module's _init() function

2013-01-03 10:47:45 -07:00

darkzero

never use profile_load outside of a module's _init() function

2013-01-03 10:47:45 -07:00

darkzero-NS

never use profile_load outside of a module's _init() function

2013-01-03 10:47:45 -07:00

diabook

fixes and tweaks to Smarty processing

2013-01-12 05:58:54 -07:00

dispy

newline at end of header

2013-01-11 10:00:10 -07:00

duepuntozero

provide a date indication in reshared content

2013-01-15 14:58:50 -08:00

easterbunny

never use profile_load outside of a module's _init() function

2013-01-03 10:47:45 -07:00

facepark

newline at end of header

2013-01-11 10:00:10 -07:00

frost

Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements

2013-01-12 12:28:14 -08:00

frost-mobile

Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements

2013-01-12 12:28:14 -08:00

greenzero

never use profile_load outside of a module's _init() function

2013-01-03 10:47:45 -07:00

purplezero

never use profile_load outside of a module's _init() function

2013-01-03 10:47:45 -07:00

quattro

fixes and tweaks to Smarty processing

2013-01-12 05:58:54 -07:00

slack-NS

never use profile_load outside of a module's _init() function

2013-01-03 10:47:45 -07:00

slackr

newline at end of header

2013-01-11 10:00:10 -07:00

smoothly

newline at end of header

2013-01-11 10:00:10 -07:00

testbubble

newline at end of header

2013-01-11 10:00:10 -07:00

vier

Merge branch 'master' of https://github.com/annando/friendica

2013-01-20 14:17:09 +01:00