Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php

2013-02-17 12:35:40 +01:00

..

cleanzero

newline at end of header

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

comix

update smart templates

2013-01-26 13:07:54 -07:00

comix-plain

update smart templates

2013-01-26 13:07:54 -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

decaf-mobile

finish updating themes for colorbox

2013-02-04 18:09:56 -07:00

diabook

Merge pull request #608 from fermionic/20130204-diabook-reduce-css

2013-02-05 17:36:33 -08:00

dispy

Merge pull request #607 from fermionic/20130204-attach-types-are-too-coarse

2013-02-05 17:19:53 -08:00

duepuntozero

move all commands inside the duepuntozero_init() function

2013-02-08 09:03:50 -07:00

easterbunny

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

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

facepark

add support for more file attachment types

2013-02-04 22:15:16 -07:00

frost

update to Frost v0.4

2013-02-10 14:57:44 -07:00

frost-mobile

add new Smarty3 templates

2013-02-10 17:11:55 -07: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

finish updating themes for colorbox

2013-02-04 18:09:56 -07:00

slack-NS

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

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

slackr

starting switching to colorbox

2013-02-04 18:09:56 -07:00

smoothly

Merge pull request #607 from fermionic/20130204-attach-types-are-too-coarse

2013-02-05 17:19:53 -08:00

testbubble

Merge pull request #607 from fermionic/20130204-attach-types-are-too-coarse

2013-02-05 17:19:53 -08:00

vier

Merge remote-tracking branch 'upstream/master'

2013-02-17 12:35:40 +01:00