Merge branch 'devel' into sidenav

Conflicts:
	client/views/nav/mobile_nav.js
This commit is contained in:
Sacha Greif 2015-03-13 08:29:19 +09:00
commit a51c71c392

View file

@ -15,6 +15,7 @@ privacyOptions = { // true means exposed
'profile.site': true,
'profile.twitter': true,
'services.twitter.profile_image_url': true,
'services.twitter.profile_image_url_https': true,
'services.facebook.id': true,
'services.twitter.screenName': true,
'services.github.screenName': true, // Github is not really used, but there are some mentions to it in the code