Petter Reinholdtsen f24d1fb94d Merge branch 'master' into first-boot-create-user ...

Resolve conflicts in modules/installed/first_boot.py.

2013-09-16 05:27:57 +02:00

..

apps

Fix typo in apps module, Open ID -> Photo Gallery.

2013-09-07 20:29:51 +02:00

help

Merged with James's upstream.

2013-04-23 17:49:22 -05:00

lib

Merge pull request #20 from petterreinholdtsen/expert-user-access

2013-09-15 16:11:18 -07:00

privacy

fixes to boostrap, new icons, mobile view works

2012-03-12 14:39:32 -04:00

router

fixes to boostrap, new icons, mobile view works

2012-03-12 14:39:32 -04:00

santiago

use stdlib's json module if simplejson is missing

2013-09-10 23:12:46 +02:00

services

fixes to boostrap, new icons, mobile view works

2012-03-12 14:39:32 -04:00

sharing

fixes to boostrap, new icons, mobile view works

2012-03-12 14:39:32 -04:00

system

Merge pull request #19 from petterreinholdtsen/first-boot-set-hostname

2013-09-15 17:43:31 -07:00

first_boot.py

Merge branch 'master' into first-boot-create-user

2013-09-16 05:27:57 +02:00