Advertisement
Guest User

Untitled

a guest
Oct 4th, 2013
49
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.53 KB | None | 0 0
  1. * 1a1eed8 (HEAD, dev) Merge branch 'frontend_fixes' into dev
  2. |\
  3. | * 3a29b51 (frontend_fixes) re-adding Alex's css changes
  4. * | 9db50a8 Merge branch 'gareths-branch' into dev
  5. |\ \
  6. | * | 7f2cd95 (gareths-branch) Ticket #141: Business Profile: Issue on certain profiles
  7. | * | 9c9c164 Ticket #144: Resort Overview: Big photo click should open lightbox
  8. * | | 75baed5 (origin/dev) Merge branch 'gareths-branch' into dev
  9. |\ \ \
  10. | |/ /
  11. | * | 7d6d130 stupid square bracket
  12. * | | 607fead Merge branch 'gareths-branch' into dev
  13. |\ \ \
  14. | |/ /
  15. | * | 40d6690 votetag temp name
  16. * | | 44ba52d merge conflict
  17. |\ \ \
  18. | |/ /
  19. | * | e66f2ab merge conflict
  20. | | | * 3e56277 (refs/stash) WIP on dev: cae7b26 votetag limiting
  21. | | | |\
  22. | |_|/ /
  23. |/| | |
  24. | | | * efa2e70 index on dev: cae7b26 votetag limiting
  25. | |_|/
  26. |/| |
  27. * | | cae7b26 votetag limiting
  28. * | | 5a6d320 Merge branch 'gareths-branch' into dev
  29. |\ \ \
  30. | |/ /
  31. | * | 07e84bb More changes
  32. * | | 5b8f263 Merge branch 'gareths-branch' into dev
  33. |\ \ \
  34. | |/ /
  35. | * | 0c46857 more faffing
  36. | * | 4fc3cbc reorganizing a little
  37. * | | e94549d Fix duplicate results using order by rand
  38. * | | 58828ad Add in map fixes to business view
  39. |/ /
  40. * | 8149c37 quick test
  41. * | 37c6b39 Things should hopefully speed up now
  42. * | 43e751e name fixes on votetags
  43. * | 8f8fc20 oops
  44. * | 3058a93 removal of multilangtext association
  45. * | a1ed2c4 another workaround for photo thumbnails
  46. * | a40713e photo thumbnail fix
  47. * | 0621e9f name fix on votetags
  48. * | fc49e17 Votetags
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement