Merge pull request #65 from Koxzi95/master

Updated authors and bundle
crmis · Mar 19, 2015 · f2bc777 · f2bc777
2 parents 21b58e7 + c93e8a6
commit f2bc777
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -3,7 +3,7 @@
 > Cox | Rees | Mitchell | [crmis](https://crm-is.herokuapp.com)
 
 ## Tom Cox
-#### [Github](https://github.com/Koxzi95) | [Website](http://koxzi.me) | [Twitter](https://twitter.com/Koxzi95) | [![endorse](https://api.coderwall.com/koxzi95/endorsecount.png)](https://coderwall.com/koxzi95)
+#### [Github](https://github.com/Koxzi95) | [Blog](http://koxzi.me) | [Twitter](https://twitter.com/Koxzi95) | [![endorse](https://api.coderwall.com/koxzi95/endorsecount.png)](https://coderwall.com/koxzi95)
 
 ## Richard Mitchell
 #### [Github](https://github.com/mr-mitch)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -38,6 +38,7 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.0)
     bcrypt (3.1.10)
+    bcrypt (3.1.10-x86-mingw32)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
@@ -97,13 +98,16 @@ GEM
     newrelic_rpm (3.10.0.279)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    nokogiri (1.6.6.2-x86-mingw32)
+      mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
     paperclip (4.2.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
     pg (0.18.1)
+    pg (0.18.1-x86-mingw32)
     rack (1.6.0)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -184,13 +188,16 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
+    sqlite3 (1.3.10-x86-mingw32)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2015.1)
+      tzinfo (>= 1.0.0)
     uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -213,6 +220,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   cancancan (~> 1.10.1)