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
..
Attr.AllowedClasses.txt
Attr.AllowedFrameTargets.txt
Attr.AllowedRel.txt
Attr.AllowedRev.txt
Attr.ClassUseCDATA.txt
Attr.DefaultImageAlt.txt
Attr.DefaultInvalidImage.txt
Attr.DefaultInvalidImageAlt.txt
Attr.DefaultTextDir.txt
Attr.EnableID.txt
Attr.ForbiddenClasses.txt
Attr.IDBlacklist.txt
Attr.IDBlacklistRegexp.txt
Attr.IDPrefix.txt
Attr.IDPrefixLocal.txt
AutoFormat.AutoParagraph.txt
AutoFormat.Custom.txt
AutoFormat.DisplayLinkURI.txt
AutoFormat.Linkify.txt
AutoFormat.PurifierLinkify.DocURL.txt
AutoFormat.PurifierLinkify.txt
AutoFormat.RemoveEmpty.RemoveNbsp.Exceptions.txt
AutoFormat.RemoveEmpty.RemoveNbsp.txt
AutoFormat.RemoveEmpty.txt
AutoFormat.RemoveSpansWithoutAttributes.txt
Cache.DefinitionImpl.txt
Cache.SerializerPath.txt
Core.AggressivelyFixLt.txt
Core.CollectErrors.txt
Core.ColorKeywords.txt
Core.ConvertDocumentToFragment.txt
Core.DirectLexLineNumberSyncInterval.txt
Core.Encoding.txt
Core.EscapeInvalidChildren.txt
Core.EscapeInvalidTags.txt
Core.EscapeNonASCIICharacters.txt
Core.HiddenElements.txt
Core.Language.txt
Core.LexerImpl.txt
Core.MaintainLineNumbers.txt
Core.RemoveInvalidImg.txt
Core.RemoveScriptContents.txt
CSS.AllowedProperties.txt
CSS.AllowImportant.txt
CSS.AllowTricky.txt
CSS.DefinitionRev.txt
CSS.MaxImgLength.txt
CSS.Proprietary.txt
Filter.Custom.txt
Filter.ExtractStyleBlocks.Escaping.txt
Filter.ExtractStyleBlocks.Scope.txt
Filter.ExtractStyleBlocks.TidyImpl.txt
Filter.ExtractStyleBlocks.txt
Filter.YouTube.txt
HTML.Allowed.txt
HTML.AllowedAttributes.txt
HTML.AllowedElements.txt
HTML.AllowedModules.txt
HTML.Attr.Name.UseCDATA.txt
HTML.BlockWrapper.txt
HTML.CoreModules.txt
HTML.CustomDoctype.txt
HTML.DefinitionID.txt
HTML.DefinitionRev.txt
HTML.Doctype.txt
HTML.ForbiddenAttributes.txt
HTML.ForbiddenElements.txt
HTML.MaxImgLength.txt
HTML.Parent.txt
HTML.Proprietary.txt
HTML.SafeEmbed.txt
HTML.SafeObject.txt
HTML.Strict.txt
HTML.TidyAdd.txt
HTML.TidyLevel.txt
HTML.TidyRemove.txt
HTML.Trusted.txt
HTML.XHTML.txt
info.ini
Output.CommentScriptContents.txt
Output.FlashCompat.txt
Output.Newline.txt
Output.SortAttr.txt
Output.TidyFormat.txt
Test.ForceNoIconv.txt
URI.AllowedSchemes.txt
URI.Base.txt
URI.DefaultScheme.txt
URI.DefinitionID.txt
URI.DefinitionRev.txt
URI.Disable.txt
URI.DisableExternal.txt
URI.DisableExternalResources.txt
URI.DisableResources.txt
URI.Host.txt
URI.HostBlacklist.txt
URI.MakeAbsolute.txt
URI.Munge.txt
URI.MungeResources.txt
URI.MungeSecretKey.txt
URI.OverrideAllowedSchemes.txt