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

..

installed

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

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

__init__.py

...

2011-02-22 13:32:45 -05:00

apps.py

...

2011-02-22 13:32:45 -05:00

auth_page.py

...

2011-02-22 13:32:45 -05:00

auth.py

...

2011-02-22 13:32:45 -05:00

config.py

...

2011-02-22 13:32:45 -05:00

expert_mode.py

...

2011-02-22 13:32:45 -05:00

file_explorer.py

...

2011-02-22 13:32:45 -05:00

first_boot.py

Merged with James's upstream.

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

forms.py

...

2011-02-22 13:32:45 -05:00

help.py

...

2011-02-22 13:32:45 -05:00

info.py

...

2011-02-22 13:32:45 -05:00

privacy.py

...

2011-02-22 13:32:45 -05:00

router.py

...

2011-02-22 13:32:45 -05:00

services.py

...

2011-02-22 13:32:45 -05:00

sharing.py

...

2011-02-22 13:32:45 -05:00

system.py

...

2011-02-22 13:32:45 -05:00

user_store.py

...

2011-02-22 13:32:45 -05:00

users.py

...

2011-02-22 13:32:45 -05:00

wan.py

...

2011-02-22 13:32:45 -05:00