merge master

This commit is contained in:
Neil Lalonde
2016-03-31 17:33:25 -04:00
parent 95f2ac6535
commit 01d0aeb5a9
6371 changed files with 86540 additions and 60860 deletions

View File

@ -1,6 +1,6 @@
module MobileDetection
def self.mobile_device?(user_agent)
user_agent =~ /Mobile|webOS|Nexus 7/ && !(user_agent =~ /iPad/)
user_agent =~ /Mobile/ && !(user_agent =~ /iPad/)
end
# we need this as a reusable chunk that is called from the cache