Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  [minor] [php-docs] Mistakenly forgot a digit in some version references.
  • Loading branch information
vovafeldman committed Apr 5, 2016
2 parents c8bc960 + 1789d89 commit 399d52e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions includes/class-freemius.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class Freemius extends Freemius_Abstract {
private $_enable_anonymous;

/**
* @since 1.7.5
* @since 1.1.7.5
* @var bool Hints the SDK if plugin should run in anonymous mode (only adds feedback form).
*/
private $_anonymous_mode;
Expand Down Expand Up @@ -1045,7 +1045,7 @@ private function should_run_connectivity_test( $flush_if_no_connectivity = false

/**
* @author Vova Feldman (@svovaf)
* @since 1.7.4
* @since 1.1.7.4
*
* @return object|false
*/
Expand Down Expand Up @@ -1122,7 +1122,7 @@ function has_api_connectivity( $flush_if_no_connectivity = false ) {

/**
* @author Vova Feldman (@svovaf)
* @since 1.7.4
* @since 1.1.7.4
*
* @param object $pong
* @param bool $is_connected
Expand Down Expand Up @@ -1179,7 +1179,7 @@ function get_anonymous_id() {

/**
* @author Vova Feldman (@svovaf)
* @since 1.7.4
* @since 1.1.7.4
*
* @return \WP_User
*/
Expand Down Expand Up @@ -1474,7 +1474,7 @@ function _email_about_firewall_issue() {
* Handle connectivity test retry approved by the user.
*
* @author Vova Feldman (@svovaf)
* @since 1.7.4
* @since 1.1.7.4
*/
function _retry_connectivity_test() {
$this->_admin_notices->remove_sticky( 'failed_connect_api_first' );
Expand Down Expand Up @@ -8594,7 +8594,7 @@ function _add_upgrade_action_link() {
* Get the URL of the page that should be loaded right after the plugin activation.
*
* @author Vova Feldman (@svovaf)
* @since 1.7.4
* @since 1.1.7.4
*
* @return string
*/
Expand Down
2 changes: 1 addition & 1 deletion templates/plugin-icon.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
$fs = freemius( $slug );

/**
* @since 1.7.5
* @since 1.1.7.5
*/
$local_path = $fs->apply_filters( 'plugin_icon', false );

Expand Down

0 comments on commit 399d52e

Please sign in to comment.