Merge branch 'api' into stable

Conflicts: lib/api/entities.rb

Merge branch 'api' into stable
Conflicts: lib/api/entities.rb
Victor Costa
2 parents 78f5eddc 15a50cf4
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
lib/api/entities.rb
@@ -2,7 +2,7 @@ module API
   module Entities
  
     Grape::Entity.format_with :timestamp do |date|
-      date.strftime('%Y/%m/%d %H:%M:%S')
+      date.strftime('%Y/%m/%d %H:%M:%S') if date
     end
  
     class Image < Grape::Entity
...	...	@@ -2,7 +2,7 @@ module API
2	2	module Entities
3	3
4	4	Grape::Entity.format_with :timestamp do \|date\|
5		- date.strftime('%Y/%m/%d %H:%M:%S')
	5	+ date.strftime('%Y/%m/%d %H:%M:%S') if date
6	6	end
7	7
8	8	class Image < Grape::Entity
...	...