WordPress.org
Get WordPress

Plugin Directory

Changeset 2397958


Ignore:
Timestamp:
10/12/2020 12:46:47 PM (5 years ago)
Author:
levertechadmin
Message:

Conflict Resolve

Location:
all-in-one-intranet/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • all-in-one-intranet/trunk/basic_all_in_one_intranet.php

    r2303132 r2397958  
    55 * Plugin URI: http://wp-glogin.com/all-in-one-intranet
    66 * Description: Instantly turn WordPress into a private corporate intranet
    7  * Version: 1.6
     7 * Version: 1.6.1
    88 * Author: Lever Technology LLC
    99 * Author URI: http://wp-glogin.com/
    … …  
    1919class aioi_basic_all_in_one_intranet extends core_all_in_one_intranet {
    2020   
    21     protected $PLUGIN_VERSION = '1.6';
     21    protected $PLUGIN_VERSION = '1.6.1';
    2222   
    2323    // Singleton

  • all-in-one-intranet/trunk/readme.txt

    r2303132 r2397958  
    33Tags: authentication, company, intranet, extranet, private, privacy, network, security, visibility, secure
    44Requires at least: 3.5
    5 Tested up to: 5.4.1
    6 Stable tag: 1.6
     5Tested up to: 5.5.1
     6Stable tag: 1.6.1
    77License: GPLv3
    88License URI: http://www.gnu.org/licenses/gpl-3.0.html
    … …  
    111111== Changelog ==
    112112
     113= 1.6.1 =
     114
     115Security update and added WordPress 5.5.1 compatibility.
     116
    113117= 1.6 =
    114118
Note: See TracChangeset for help on using the changeset viewer.