Merge remote-tracking branch 'origin/master' into trailingcolons
Conflicts: inc/lang/cs/lang.php inc/lang/hu/lang.php
Showing
- .gitattributes 8 additions, 0 deletions.gitattributes
- feed.php 5 additions, 2 deletionsfeed.php
- inc/HTTPClient.php 5 additions, 6 deletionsinc/HTTPClient.php
- inc/cache.php 1 addition, 0 deletionsinc/cache.php
- inc/changelog.php 34 additions, 13 deletionsinc/changelog.php
- inc/common.php 151 additions, 17 deletionsinc/common.php
- inc/form.php 5 additions, 5 deletionsinc/form.php
- inc/lang/cs/lang.php 3 additions, 3 deletionsinc/lang/cs/lang.php
- inc/lang/en/lang.php 1 addition, 0 deletionsinc/lang/en/lang.php
- inc/lang/fr/lang.php 12 additions, 7 deletionsinc/lang/fr/lang.php
- inc/lang/hu/lang.php 7 additions, 2 deletionsinc/lang/hu/lang.php
- inc/lang/nl/lang.php 1 addition, 0 deletionsinc/lang/nl/lang.php
- inc/pageutils.php 71 additions, 2 deletionsinc/pageutils.php
- inc/parser/code.php 6 additions, 6 deletionsinc/parser/code.php
- inc/parser/metadata.php 396 additions, 179 deletionsinc/parser/metadata.php
- inc/parser/parser.php 5 additions, 0 deletionsinc/parser/parser.php
- inc/parser/renderer.php 626 additions, 139 deletionsinc/parser/renderer.php
- inc/parser/xhtml.php 694 additions, 346 deletionsinc/parser/xhtml.php
- inc/subscription.php 5 additions, 3 deletionsinc/subscription.php
- install.php 5 additions, 0 deletionsinstall.php
Loading
Please register or sign in to comment