annotate .svn/pristine/ee/ee7fe9ed41ae5054b215eb20ccb460e8dc835ca3.svn-base @ 1519:afce8026aaeb redmine-2.4-integration

Merge from branch "live"
author Chris Cannam
date Tue, 09 Sep 2014 09:34:53 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 ---
Chris@909 2 user_preferences_001:
Chris@909 3 others: |
Chris@909 4 ---
Chris@909 5 :my_page_layout:
Chris@909 6 left:
Chris@909 7 - latestnews
Chris@909 8 - documents
Chris@909 9 right:
Chris@909 10 - issuesassignedtome
Chris@909 11 top:
Chris@909 12 - calendar
Chris@909 13
Chris@909 14 id: 1
Chris@909 15 user_id: 1
Chris@909 16 hide_mail: true
Chris@909 17 user_preferences_002:
Chris@909 18 others: |
Chris@909 19 ---
Chris@909 20 :my_page_layout:
Chris@909 21 left:
Chris@909 22 - latestnews
Chris@909 23 - documents
Chris@909 24 right:
Chris@909 25 - issuesassignedtome
Chris@909 26 top:
Chris@909 27 - calendar
Chris@909 28
Chris@909 29 id: 2
Chris@909 30 user_id: 3
Chris@909 31 hide_mail: false