diff options
| author | jessib <jessib@leap.se> | 2013-01-17 10:39:15 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-01-17 10:39:15 -0800 |
| commit | 7d7741f7d26c3ae7ee1dc347a6b1a1142a3c2824 (patch) | |
| tree | 5ec11b9600d4330ec94f56dda779634cd7dcae1b /.gitignore | |
| parent | 2485527650c4832d764d318e91c10bafde8b8ae5 (diff) | |
| parent | b550cd14f33b9664fe6b547dc56107fae7d12caf (diff) | |
Merge branch 'master' into feature/unauthenticated_tickets
Conflicts:
help/app/views/tickets/_comment.html.haml
help/app/views/tickets/_new_comment.html.haml
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions