Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
catfan committed Mar 7, 2018
2 parents a6b7b05 + 1cd2d8f commit 4e51f74
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017 Angel Lai
Copyright (c) 2018 Angel Lai

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
10 changes: 6 additions & 4 deletions src/Medoo.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/*!
* Medoo database framework
* https://medoo.in
* Version 1.5.4
* Version 1.5.5
*
* Copyright 2017, Angel Lai
* Copyright 2018, Angel Lai
* Released under the MIT license
*/

Expand Down Expand Up @@ -81,8 +81,10 @@ public function __construct($options = null)
{
$attr = $options[ 'dsn' ];
}

return false;
else
{
return false;
}
}
else
{
Expand Down

0 comments on commit 4e51f74

Please sign in to comment.