Merge branch '7.x-1.x' of git.drupal.org:project/views_timelinejs into 7.x-1.x
authoroperinko
Wed, 12 Dec 2012 07:16:12 +0000 (09:16 +0200)
committeroperinko
Wed, 12 Dec 2012 07:16:12 +0000 (09:16 +0200)
commit92a225b46a0243f425f7067b5d48e6a29e2a348a
tree1273b0a00ec0bd7cb3c274939fa3ce66596ab1e0
parentea8efccb691403714a822bfc9e10f3b6f6cac862
parent92cbfe17145a86c6a5365cd3fb46d71ae0aafbe9
Merge branch '7.x-1.x' of git.drupal.org:project/views_timelinejs into 7.x-1.x

* '7.x-1.x' of git.drupal.org:project/views_timelinejs:
  Added missing empty lines to ends of files.
  Added missing empty lines to ends of files.
  Added checks for link field value.
  Added support for File field.
  Issue #1855440 - Notice: in views_timelinejs_plugin_style_timelinejs->render()
  Issue #1860744 - Optional Link text always displayed
  Issue #1860742 - Handle optional end dates correctly