Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Feeds
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

04d05dcc

Commit 04d05dcc authored 12 years ago by Thomas Renard

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into owncloud

parents 4a0a3ca9 715a8239

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

classes/pluginhost.php 95 additions, 3 deletions

classes/pluginhost.php
classes/pref/feeds.php 1 addition, 1 deletion

classes/pref/feeds.php
classes/pref/prefs.php 19 additions, 2 deletions

classes/pref/prefs.php
include/functions.php 8 additions, 33 deletions

include/functions.php
include/sanity_check.php 4 additions, 0 deletions

include/sanity_check.php
js/prefs.js 17 additions, 0 deletions

js/prefs.js
plugins/example/example.php 12 additions, 3 deletions

plugins/example/example.php
schema/ttrss_schema_mysql.sql 10 additions, 1 deletion

schema/ttrss_schema_mysql.sql
schema/ttrss_schema_pgsql.sql 8 additions, 1 deletion

schema/ttrss_schema_pgsql.sql
schema/versions/mysql/101.sql 12 additions, 0 deletions

schema/versions/mysql/101.sql
schema/versions/pgsql/101.sql 11 additions, 0 deletions

schema/versions/pgsql/101.sql

with 197 additions and 44 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment