Sacha Greif 18c63f9886 Merge branch 'master' into devel ... Conflicts: server/publications/posts_list.js		2015-01-07 16:53:36 +09:00
..
client	Getting rid of redundant permissions functions	2015-01-07 08:22:46 +01:00
server	remove enableFeeds setting; stop synced-cron message logging	2015-01-06 09:51:35 +09:00
newsletter.js	add setting for enabling newsletter	2014-12-30 13:46:48 +09:00