Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit cbbf313 Merge: 2be9be0 2fa011d Author: Andrew Cobby <[email protected]> Date: Wed Oct 10 19:59:59 2012 +1100 Merge branch 'master' into jamie commit 2be9be0 Author: Jamie Ferguson <[email protected]> Date: Wed Oct 10 18:46:38 2012 +1100 Hover state for G+ logo commit c17b2b8 Author: Jamie Ferguson <[email protected]> Date: Wed Oct 10 18:07:30 2012 +1100 Changed date commit 655b88a Author: Jamie Ferguson <[email protected]> Date: Wed Oct 10 09:27:11 2012 +1100 Spacing of budget allocator categores commit 0c53e55 Merge: 16053ef 9f9b79e Author: Andrew Cobby <[email protected]> Date: Tue Oct 9 23:28:21 2012 +1100 Merge branch 'master' into jamie commit 16053ef Merge: 66ff145 a41c814 Author: Andrew Cobby <[email protected]> Date: Tue Oct 9 14:44:29 2012 +1100 Merge branch 'jamie' of github.com:TheGlobalMail/YourFederalBudget2012 into jamie commit 66ff145 Merge: dd867a9 5cdafc2 Author: Andrew Cobby <[email protected]> Date: Tue Oct 9 14:44:17 2012 +1100 Merge branch 'master' into jamie commit a41c814 Author: Jamie Ferguson <[email protected]> Date: Tue Oct 9 11:32:59 2012 +1100 Updated Priv Ed graphic commit 5316656 Author: Jamie Ferguson <[email protected]> Date: Tue Oct 9 11:08:49 2012 +1100 Text changes in about commit dd867a9 Merge: e6b243b 9756973 Author: Andrew Cobby <[email protected]> Date: Tue Oct 9 09:29:57 2012 +1100 Merge branch 'master' into jamie Conflicts: templates/javascript.twig templates/more-info/defence.twig templates/more-info/immigration.twig templates/more-info/industryAssistance.twig commit e6b243b Merge: 86e5468 80dd935 Author: Andrew Cobby <[email protected]> Date: Tue Oct 9 09:26:16 2012 +1100 Merge branch 'jamie' of github.com:TheGlobalMail/YourFederalBudget2012 into jamie commit 80dd935 Author: Jamie Ferguson <[email protected]> Date: Tue Oct 9 09:04:48 2012 +1100 About tool text commit 6f7e47d Author: Jamie Ferguson <[email protected]> Date: Tue Oct 9 08:49:18 2012 +1100 Safi's text fixes commit 86e5468 Merge: 1be8075 a3544f7 Author: Andrew Cobby <[email protected]> Date: Mon Oct 8 17:48:03 2012 +1100 Merge branch 'jamie' of github.com:TheGlobalMail/YourFederalBudget2012 into jamie commit 1be8075 Author: Andrew Cobby <[email protected]> Date: Mon Oct 8 17:46:19 2012 +1100 Fix JavaScript loading again commit a3544f7 Author: Jamie Ferguson <[email protected]> Date: Mon Oct 8 17:12:23 2012 +1100 Spelling error FIXEDDDD!!!!! commit 7a4f1e9 Author: Jamie Ferguson <[email protected]> Date: Mon Oct 8 16:58:34 2012 +1100 Size of thumbs in related commit 3f40be5 Author: Jamie Ferguson <[email protected]> Date: Mon Oct 8 16:12:23 2012 +1100 Edited summary commit 4dd6a5d Author: Jamie Ferguson <[email protected]> Date: Mon Oct 8 16:11:57 2012 +1100 Curly quotes commit e555dce Merge: 51fbc84 946747f Author: Jamie Ferguson <[email protected]> Date: Mon Oct 8 16:01:04 2012 +1100 Merge branch 'jamie' of github.com:TheGlobalMail/YourFederalBudget2012 into jamie commit 51fbc84 Author: Jamie Ferguson <[email protected]> Date: Mon Oct 8 16:00:35 2012 +1100 Summaries, more info commit 946747f Merge: cae75b2 326a494 Author: Andrew Cobby <[email protected]> Date: Mon Oct 8 15:40:14 2012 +1100 Merge branch 'master' into jamie commit cae75b2 Merge: fc246c2 118573a Author: Andrew Cobby <[email protected]> Date: Mon Oct 8 15:27:02 2012 +1100 Merge branch 'master' into jamie commit fc246c2 Author: Jamie Ferguson <[email protected]> Date: Mon Oct 8 13:27:14 2012 +1100 Deleted tin-foil text commit fa033a3 Author: Jamie Ferguson <[email protected]> Date: Mon Oct 8 13:04:59 2012 +1100 Tooltip copy commit cc96c79 Author: Jamie Ferguson <[email protected]> Date: Mon Oct 8 11:58:07 2012 +1100 Removed full stops from graphic commit e7d40af Author: Jamie Ferguson <[email protected]> Date: Mon Oct 8 11:13:33 2012 +1100 Changed colour of flagged abuse text commit 1456e88 Author: Jamie Ferguson <[email protected]> Date: Mon Oct 8 11:11:11 2012 +1100 Adjusted line-height of header text
- Loading branch information