Merge branch 'development' of https://github.com/FChannel0/FChannel-Server into faq-and-rules

# Conflicts:
#	client.go
#	static/faq.html

1 files changed, 8 insertions, 1 deletions

diff --git a/databaseschema.psql b/databaseschema.psql
index e12813e..02c229b 100644
--- a/databaseschema.psql
+++ b/databaseschema.psql
@@ -216,7 +216,14 @@ owner varchar(100),
 file varchar(100)
 );
 
+CREATE TABLE IF NOT EXISTS newsItem(
+title text,
+content text,
+time bigint
+);
+
 ALTER TABLE actor ADD COLUMN IF NOT EXISTS publicKeyPem varchar(100) default '';
 
 ALTER TABLE activitystream ADD COLUMN IF NOT EXISTS sensitive boolean default false;
-ALTER TABLE cacheactivitystream ADD COLUMN IF NOT EXISTS sensitive boolean default false;
\ No newline at end of file
+ALTER TABLE cacheactivitystream ADD COLUMN IF NOT EXISTS sensitive boolean default false;
+