opensourceprojects.eu / osp-allura / Commit [915d1b]

Commit [915d1b] master History

Merge branch 'dev' of ssh://engr.geek.net/forge into dev

Authored by: Jenny Steele 2012-06-29

Browse code at this revision

Parent(s): [489621][e9fb6c]

Child(ren): [1abb07]

changed	Allura/allura/controllers/project.py
changed	Allura/allura/ext/user_profile/user_main.py
changed	Allura/allura/tests/functional/test_root.py
changed	ForgeActivity/forgeactivity/tests/functional/test_root.py
changed	ForgeActivity/forgeactivity/main.py
changed	requirements-common.txt
changed	Allura/allura/controllers/root.py

Allura/allura/controllers/project.py Diff Switch to side-by-side view

Allura/allura/ext/user_profile/user_main.py Diff Switch to side-by-side view

Allura/allura/tests/functional/test_root.py Diff Switch to side-by-side view

ForgeActivity/forgeactivity/tests/functional/test_root.py Diff Switch to side-by-side view

ForgeActivity/forgeactivity/main.py Diff Switch to side-by-side view

requirements-common.txt Diff Switch to side-by-side view

Allura/allura/controllers/root.py Diff Switch to side-by-side view