Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica ...

Conflicts:
	include/config.php
	update.php

2012-04-05 13:39:15 +02:00

..

AttrDef

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

2012-04-05 13:39:15 +02:00

AttrTransform

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

2012-04-05 13:39:15 +02:00

ChildDef

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

2012-04-05 13:39:15 +02:00

ConfigSchema

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

2012-04-05 13:39:15 +02:00

DefinitionCache

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

2012-04-05 13:39:15 +02:00

EntityLookup

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

2012-04-05 13:39:15 +02:00

Filter

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

2012-04-05 13:39:15 +02:00

HTMLModule

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

2012-04-05 13:39:15 +02:00

Injector

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

2012-04-05 13:39:15 +02:00

Language

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

2012-04-05 13:39:15 +02:00

Lexer

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

2012-04-05 13:39:15 +02:00

Printer

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

2012-04-05 13:39:15 +02:00

Strategy

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

2012-04-05 13:39:15 +02:00

TagTransform

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

2012-04-05 13:39:15 +02:00

Token

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

2012-04-05 13:39:15 +02:00

URIFilter

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

2012-04-05 13:39:15 +02:00

URIScheme

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

2012-04-05 13:39:15 +02:00

VarParser

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

2012-04-05 13:39:15 +02:00

AttrCollections.php

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

2012-04-05 13:39:15 +02:00

AttrDef.php

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

2012-04-05 13:39:15 +02:00

AttrTransform.php

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

2012-04-05 13:39:15 +02:00

AttrTypes.php

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

2012-04-05 13:39:15 +02:00

AttrValidator.php

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

2012-04-05 13:39:15 +02:00

Bootstrap.php

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

2012-04-05 13:39:15 +02:00

ChildDef.php

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

2012-04-05 13:39:15 +02:00

Config.php

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

2012-04-05 13:39:15 +02:00

ConfigSchema.php

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

2012-04-05 13:39:15 +02:00

ContentSets.php

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

2012-04-05 13:39:15 +02:00

Context.php

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

2012-04-05 13:39:15 +02:00

CSSDefinition.php

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

2012-04-05 13:39:15 +02:00

Definition.php

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

2012-04-05 13:39:15 +02:00

DefinitionCache.php

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

2012-04-05 13:39:15 +02:00

DefinitionCacheFactory.php

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

2012-04-05 13:39:15 +02:00

Doctype.php

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

2012-04-05 13:39:15 +02:00

DoctypeRegistry.php

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

2012-04-05 13:39:15 +02:00

ElementDef.php

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

2012-04-05 13:39:15 +02:00

Encoder.php

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

2012-04-05 13:39:15 +02:00

EntityLookup.php

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

2012-04-05 13:39:15 +02:00

EntityParser.php

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

2012-04-05 13:39:15 +02:00

ErrorCollector.php

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

2012-04-05 13:39:15 +02:00

ErrorStruct.php

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

2012-04-05 13:39:15 +02:00

Exception.php

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

2012-04-05 13:39:15 +02:00

Filter.php

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

2012-04-05 13:39:15 +02:00

Generator.php

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

2012-04-05 13:39:15 +02:00

HTMLDefinition.php

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

2012-04-05 13:39:15 +02:00

HTMLModule.php

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

2012-04-05 13:39:15 +02:00

HTMLModuleManager.php

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

2012-04-05 13:39:15 +02:00

IDAccumulator.php

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

2012-04-05 13:39:15 +02:00

Injector.php

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

2012-04-05 13:39:15 +02:00

Language.php

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

2012-04-05 13:39:15 +02:00

LanguageFactory.php

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

2012-04-05 13:39:15 +02:00

Length.php

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

2012-04-05 13:39:15 +02:00

Lexer.php

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

2012-04-05 13:39:15 +02:00

PercentEncoder.php

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

2012-04-05 13:39:15 +02:00

Printer.php

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

2012-04-05 13:39:15 +02:00

PropertyList.php

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

2012-04-05 13:39:15 +02:00

PropertyListIterator.php

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

2012-04-05 13:39:15 +02:00

Strategy.php

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

2012-04-05 13:39:15 +02:00

StringHash.php

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

2012-04-05 13:39:15 +02:00

StringHashParser.php

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

2012-04-05 13:39:15 +02:00

TagTransform.php

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

2012-04-05 13:39:15 +02:00

Token.php

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

2012-04-05 13:39:15 +02:00

TokenFactory.php

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

2012-04-05 13:39:15 +02:00

UnitConverter.php

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

2012-04-05 13:39:15 +02:00

URI.php

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

2012-04-05 13:39:15 +02:00

URIDefinition.php

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

2012-04-05 13:39:15 +02:00

URIFilter.php

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

2012-04-05 13:39:15 +02:00

URIParser.php

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

2012-04-05 13:39:15 +02:00

URIScheme.php

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

2012-04-05 13:39:15 +02:00

URISchemeRegistry.php

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

2012-04-05 13:39:15 +02:00

VarParser.php

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

2012-04-05 13:39:15 +02:00

VarParserException.php

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

2012-04-05 13:39:15 +02:00